mirror of
https://github.com/spring-projects/spring-security.git
synced 2025-06-27 14:22:47 +00:00
Fix Jackson 2.7+
UnmodifiableSetDeserializer added which will ensure Collection$UnmodifiableSet deserialize properly with jackson-databind 2.7+ Fixes gh-4073
This commit is contained in:
parent
0b1e3b4e4a
commit
48ff518a41
@ -0,0 +1,61 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2015-2016 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.springframework.security.jackson2;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.core.JsonParser;
|
||||||
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
|
import com.fasterxml.jackson.databind.DeserializationContext;
|
||||||
|
import com.fasterxml.jackson.databind.JsonDeserializer;
|
||||||
|
import com.fasterxml.jackson.databind.JsonNode;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import com.fasterxml.jackson.databind.node.ArrayNode;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Iterator;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Custom deserializer for {@link UnmodifiableSetMixin}.
|
||||||
|
*
|
||||||
|
* @author Jitendra Singh
|
||||||
|
* @see UnmodifiableSetMixin
|
||||||
|
* @since 4.2
|
||||||
|
*/
|
||||||
|
class UnmodifiableSetDeserializer extends JsonDeserializer<Set> {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Set deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
|
||||||
|
ObjectMapper mapper = (ObjectMapper) jp.getCodec();
|
||||||
|
JsonNode node = mapper.readTree(jp);
|
||||||
|
Set<Object> resultSet = new HashSet<Object>();
|
||||||
|
if (node != null) {
|
||||||
|
if (node instanceof ArrayNode) {
|
||||||
|
ArrayNode arrayNode = (ArrayNode) node;
|
||||||
|
Iterator<JsonNode> nodeIterator = arrayNode.iterator();
|
||||||
|
while (nodeIterator.hasNext()) {
|
||||||
|
JsonNode elementNode = nodeIterator.next();
|
||||||
|
resultSet.add(mapper.readValue(elementNode.toString(), Object.class));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
resultSet.add(mapper.readValue(node.toString(), Object.class));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Collections.unmodifiableSet(resultSet);
|
||||||
|
}
|
||||||
|
}
|
@ -18,6 +18,7 @@ package org.springframework.security.jackson2;
|
|||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||||
import com.fasterxml.jackson.annotation.JsonTypeInfo;
|
import com.fasterxml.jackson.annotation.JsonTypeInfo;
|
||||||
|
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
@ -31,11 +32,13 @@ import java.util.Set;
|
|||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
* @author Jitendra Singh
|
* @author Jitendra Singh
|
||||||
|
* @see UnmodifiableSetDeserializer
|
||||||
* @see CoreJackson2Module
|
* @see CoreJackson2Module
|
||||||
* @see SecurityJacksonModules
|
* @see SecurityJacksonModules
|
||||||
* @since 4.2
|
* @since 4.2
|
||||||
*/
|
*/
|
||||||
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
|
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
|
||||||
|
@JsonDeserialize(using = UnmodifiableSetDeserializer.class)
|
||||||
class UnmodifiableSetMixin {
|
class UnmodifiableSetMixin {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user