Skip to content

Commit cab0a7d

Browse files
committed
Fix remaining code warnings.
* Use try-with-resources to avoid throwing from a finally block. * Switch to anyCollection which requires explicit type arguments.
1 parent 9214f52 commit cab0a7d

File tree

2 files changed

+21
-23
lines changed

2 files changed

+21
-23
lines changed

src/main/java/com/github/fge/jsonschema/core/load/URIManager.java

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -97,31 +97,28 @@ public JsonNode getContent(final URI uri)
9797
.setMessage(BUNDLE.getMessage("refProcessing.unhandledScheme"))
9898
.putArgument("scheme", scheme).putArgument("uri", uri));
9999

100-
final Closer closer = Closer.create();
101-
final InputStream in;
100+
try (final Closer closer = Closer.create()) {
101+
final InputStream in;
102102

103-
try {
104-
in = closer.register(downloader.fetch(uri));
105-
return reader.fromInputStream(in);
106-
} catch (JsonMappingException e) {
107-
throw new ProcessingException(new ProcessingMessage()
108-
.setMessage(e.getOriginalMessage()).put("uri", uri));
109-
} catch (JsonParseException e) {
110-
throw new ProcessingException(new ProcessingMessage()
111-
.setMessage(BUNDLE.getMessage("uriManager.uriNotJson"))
112-
.putArgument("uri", uri)
113-
.put("parsingMessage", e.getOriginalMessage()));
114-
} catch (IOException e) {
115-
throw new ProcessingException(new ProcessingMessage()
116-
.setMessage(BUNDLE.getMessage("uriManager.uriIOError"))
117-
.putArgument("uri", uri)
118-
.put("exceptionMessage", e.getMessage()));
119-
} finally {
120103
try {
121-
closer.close();
122-
} catch (IOException ignored) {
123-
throw new IllegalStateException();
104+
in = closer.register(downloader.fetch(uri));
105+
return reader.fromInputStream(in);
106+
} catch (JsonMappingException e) {
107+
throw new ProcessingException(new ProcessingMessage()
108+
.setMessage(e.getOriginalMessage()).put("uri", uri));
109+
} catch (JsonParseException e) {
110+
throw new ProcessingException(new ProcessingMessage()
111+
.setMessage(BUNDLE.getMessage("uriManager.uriNotJson"))
112+
.putArgument("uri", uri)
113+
.put("parsingMessage", e.getOriginalMessage()));
114+
} catch (IOException e) {
115+
throw new ProcessingException(new ProcessingMessage()
116+
.setMessage(BUNDLE.getMessage("uriManager.uriIOError"))
117+
.putArgument("uri", uri)
118+
.put("exceptionMessage", e.getMessage()));
124119
}
120+
} catch (IOException e) {
121+
throw new IllegalStateException(e);
125122
}
126123
}
127124
}

src/test/java/com/github/fge/jsonschema/core/keyword/syntax/SyntaxProcessorTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import com.google.common.base.Function;
4646
import com.google.common.collect.Iterables;
4747
import org.mockito.ArgumentCaptor;
48+
import org.mockito.Mockito;
4849
import org.testng.annotations.BeforeMethod;
4950
import org.testng.annotations.DataProvider;
5051
import org.testng.annotations.Test;
@@ -201,7 +202,7 @@ public void checkingWillNotDiveIntoUnknownKeywords()
201202
final ValueHolder<SchemaTree> holder = ValueHolder.hold("schema", tree);
202203

203204
processor.process(report, holder);
204-
verify(checker, never()).checkSyntax(anyCollectionOf(JsonPointer.class),
205+
verify(checker, never()).checkSyntax(Mockito.<JsonPointer>anyCollection(),
205206
any(MessageBundle.class), anyReport(), anySchema());
206207
}
207208

0 commit comments

Comments
 (0)