Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Drop JsonSimpleJsonParser and JSON simple dependency

Browse Source 
Closes gh-13471
This commit is contained in:
Stephane Nicoll
2018-06-18 10:11:50 +02:00
parent fa7da40640
commit 0c4176f596
6 changed files with 3 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-project/spring-boot-dependencies/pom.xml
View File

@@ -148,7 +148,6 @@
<selenium-htmlunit.version>2.29.3</selenium-htmlunit.version>
<sendgrid.version>4.1.2</sendgrid.version>
<servlet-api.version>3.1.0</servlet-api.version>
<simple-json.version>1.1.1</simple-json.version>
<slf4j.version>1.7.25</slf4j.version>
<snakeyaml.version>1.19</snakeyaml.version>
<solr.version>7.2.1</solr.version>
@@ -623,17 +622,6 @@
<artifactId>gson</artifactId>
<version>${gson.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>${simple-json.version}</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>

5
spring-boot-project/spring-boot-docs/pom.xml
View File

@@ -131,11 +131,6 @@
<artifactId>gson</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>

5
spring-boot-project/spring-boot/pom.xml
View File

@@ -56,11 +56,6 @@
<artifactId>gson</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.samskivert</groupId>
<artifactId>jmustache</artifactId>

11
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/JsonParserFactory.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 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.
@@ -25,15 +25,13 @@ import org.springframework.util.ClassUtils;
* @see JacksonJsonParser
* @see GsonJsonParser
* @see YamlJsonParser
* @see JsonSimpleJsonParser
* @see BasicJsonParser
*/
public abstract class JsonParserFactory {
/**
* Static factory for the "best" JSON parser available on the classpath. Tries Jackson
* 2, then Gson, Snake YAML, Simple JSON, JSON (from eclipse), and then falls back to
* the {@link BasicJsonParser}.
* Static factory for the "best" JSON parser available on the classpath. Tries
* Jackson, then Gson, Snake YAML,and then falls back to the {@link BasicJsonParser}.
* @return a {@link JsonParser}
*/
public static JsonParser getJsonParser() {
@@ -46,9 +44,6 @@ public abstract class JsonParserFactory {
if (ClassUtils.isPresent("org.yaml.snakeyaml.Yaml", null)) {
return new YamlJsonParser();
}
if (ClassUtils.isPresent("org.json.simple.JSONObject", null)) {
return new JsonSimpleJsonParser();
}
return new BasicJsonParser();
}

49
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/JsonSimpleJsonParser.java
View File

@@ -1,49 +0,0 @@
/*
* Copyright 2012-2018 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.boot.json;
import java.util.List;
import java.util.Map;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
/**
* Thin wrapper to adapt {@link org.json.simple.JSONObject} to a {@link JsonParser}.
*
* @author Dave Syer
* @author Jean de Klerk
* @since 1.2.0
* @see JsonParserFactory
*/
public class JsonSimpleJsonParser extends AbstractJsonParser {
@Override
@SuppressWarnings("unchecked")
public Map<String, Object> parseMap(String json) {
return (Map<String, Object>) tryParse(() -> new JSONParser().parse(json),
ParseException.class);
}
@Override
@SuppressWarnings("unchecked")
public List<Object> parseList(String json) {
return (List<Object>) tryParse(() -> new JSONParser().parse(json),
ParseException.class);
}
}

31
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/JsonSimpleJsonParserTests.java
View File

@@ -1,31 +0,0 @@
/*
* Copyright 2012-2017 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.boot.json;
/**
* Tests for {@link JsonSimpleJsonParser}.
*
* @author Dave Syer
*/
public class JsonSimpleJsonParserTests extends AbstractJsonParserTests {
@Override
protected JsonParser getParser() {
return new JsonSimpleJsonParser();
}
}