diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/BasicJsonTester.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/BasicJsonTester.java index 9ce37b88838..71d7ef644fd 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/BasicJsonTester.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/BasicJsonTester.java @@ -17,7 +17,6 @@ package org.springframework.boot.test.json; import java.io.File; -import java.io.IOException; import java.io.InputStream; import org.springframework.core.io.Resource; @@ -63,9 +62,9 @@ public class BasicJsonTester { * using {@code resourceLoadClass}. * @param source JSON content or a {@code .json} resource name * @return the JSON content - * @throws IOException on load error + * @on load error */ - public JsonContent from(CharSequence source) throws IOException { + public JsonContent from(CharSequence source) { return getJsonContent(this.loader.getJson(source)); } @@ -74,10 +73,9 @@ public class BasicJsonTester { * @param path the path of the resource to load * @param resourceLoadClass the classloader used load the resource * @return the JSON content - * @throws IOException on load error + * @on load error */ - public JsonContent from(String path, Class resourceLoadClass) - throws IOException { + public JsonContent from(String path, Class resourceLoadClass) { return getJsonContent(this.loader.getJson(path, resourceLoadClass)); } @@ -85,9 +83,9 @@ public class BasicJsonTester { * Create JSON content from the specified JSON bytes. * @param source the bytes of JSON * @return the JSON content - * @throws IOException on load error + * @on load error */ - public JsonContent from(byte[] source) throws IOException { + public JsonContent from(byte[] source) { return getJsonContent(this.loader.getJson(source)); } @@ -95,9 +93,9 @@ public class BasicJsonTester { * Create JSON content from the specified JSON file. * @param source the file containing JSON * @return the JSON content - * @throws IOException on load error + * @on load error */ - public JsonContent from(File source) throws IOException { + public JsonContent from(File source) { return getJsonContent(this.loader.getJson(source)); } @@ -105,9 +103,9 @@ public class BasicJsonTester { * Create JSON content from the specified JSON input stream. * @param source the input stream containing JSON * @return the JSON content - * @throws IOException on load error + * @on load error */ - public JsonContent from(InputStream source) throws IOException { + public JsonContent from(InputStream source) { return getJsonContent(this.loader.getJson(source)); } @@ -115,9 +113,9 @@ public class BasicJsonTester { * Create JSON content from the specified JSON resource. * @param source the resource containing JSON * @return the JSON content - * @throws IOException on load error + * @on load error */ - public JsonContent from(Resource source) throws IOException { + public JsonContent from(Resource source) { return getJsonContent(this.loader.getJson(source)); } diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java index 5cd1e6c13f0..ced1d7e87ab 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java @@ -17,7 +17,6 @@ package org.springframework.boot.test.json; import java.io.File; -import java.io.IOException; import java.io.InputStream; import java.util.List; import java.util.Map; @@ -67,28 +66,22 @@ public class JsonContentAssert extends AbstractAssert resourceLoadClass) - throws IOException { + public JsonContentAssert isEqualToJson(String path, Class resourceLoadClass) { String expectedJson = this.loader.getJson(path, resourceLoadClass); return assertNotFailed(compare(expectedJson, JSONCompareMode.LENIENT)); } @@ -127,10 +119,10 @@ public class JsonContentAssert extends AbstractAssert resourceLoadClass) throws IOException { + Class resourceLoadClass) { String expectedJson = this.loader.getJson(path, resourceLoadClass); return assertNotFailed(compare(expectedJson, JSONCompareMode.STRICT)); } @@ -211,10 +202,10 @@ public class JsonContentAssert extends AbstractAssert resourceLoadClass, - JSONCompareMode compareMode) throws IOException { + JSONCompareMode compareMode) { String expectedJson = this.loader.getJson(path, resourceLoadClass); return assertNotFailed(compare(expectedJson, compareMode)); } @@ -296,11 +286,10 @@ public class JsonContentAssert extends AbstractAssert resourceLoadClass, - JSONComparator comparator) throws IOException { + JSONComparator comparator) { String expectedJson = this.loader.getJson(path, resourceLoadClass); return assertNotFailed(compare(expectedJson, comparator)); } @@ -383,11 +371,10 @@ public class JsonContentAssert extends AbstractAssert resourceLoadClass) - throws IOException { + public JsonContentAssert isNotEqualToJson(String path, Class resourceLoadClass) { String expectedJson = this.loader.getJson(path, resourceLoadClass); return assertNotPassed(compare(expectedJson, JSONCompareMode.LENIENT)); } @@ -501,10 +479,10 @@ public class JsonContentAssert extends AbstractAssert resourceLoadClass) throws IOException { + Class resourceLoadClass) { String expectedJson = this.loader.getJson(path, resourceLoadClass); return assertNotPassed(compare(expectedJson, JSONCompareMode.STRICT)); } @@ -585,11 +562,10 @@ public class JsonContentAssert extends AbstractAssert resourceLoadClass, - JSONCompareMode compareMode) throws IOException { + JSONCompareMode compareMode) { String expectedJson = this.loader.getJson(path, resourceLoadClass); return assertNotPassed(compare(expectedJson, compareMode)); } @@ -672,11 +646,11 @@ public class JsonContentAssert extends AbstractAssert resourceLoadClass, - JSONComparator comparator) throws IOException { + JSONComparator comparator) { String expectedJson = this.loader.getJson(path, resourceLoadClass); return assertNotPassed(compare(expectedJson, comparator)); } @@ -760,11 +734,11 @@ public class JsonContentAssert extends AbstractAssert resourceLoadClass) throws IOException { + public String getJson(String path, Class resourceLoadClass) { return getJson(new ClassPathResource(path, resourceLoadClass)); } - public String getJson(byte[] source) throws IOException { + public String getJson(byte[] source) { return getJson(new ByteArrayInputStream(source)); } - public String getJson(File source) throws IOException { - return getJson(new FileInputStream(source)); + public String getJson(File source) { + try { + return getJson(new FileInputStream(source)); + } + catch (IOException ex) { + throw new IllegalStateException("Unable to load JSON from " + source, ex); + } } - public String getJson(Resource source) throws IOException { - return getJson(source.getInputStream()); + public String getJson(Resource source) { + try { + return getJson(source.getInputStream()); + } + catch (IOException ex) { + throw new IllegalStateException("Unable to load JSON from " + source, ex); + } } - public String getJson(InputStream source) throws IOException { - return FileCopyUtils.copyToString(new InputStreamReader(source)); + public String getJson(InputStream source) { + try { + return FileCopyUtils.copyToString(new InputStreamReader(source)); + } + catch (IOException ex) { + throw new IllegalStateException("Unable to load JSON from InputStream", ex); + } } }