Skip to content

error handling for classpath schema client #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 10, 2019
Merged

error handling for classpath schema client #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d87933
error handling for classpath schema client
rjruizes Oct 9, 2019
e669256
test error handling
rjruizes Oct 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions core/src/main/java/org/everit/json/schema/loader/ClassPathAwareSchemaClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
import static java.util.Collections.unmodifiableList;
import static java.util.Objects.requireNonNull;

import java.io.IOException;
import java.io.InputStream;
import java.io.UncheckedIOException;
import java.util.List;
import java.util.Optional;

Expand All @@ -19,9 +21,17 @@ class ClassPathAwareSchemaClient implements SchemaClient {
}

@Override public InputStream get(String url) {
return handleProtocol(url)
.map(this::loadFromClasspath)
.orElseGet(() -> fallbackClient.get(url));
Optional<String> maybeString = handleProtocol(url);
if(maybeString.isPresent()) {
InputStream stream = this.loadFromClasspath(maybeString.get());
if(stream != null) {
return stream;
} else {
throw new UncheckedIOException(new IOException(String.format("Could not find %s", url)));
}
} else {
return fallbackClient.get(url);
}
}

private InputStream loadFromClasspath(String str) {
Expand Down
15 changes: 15 additions & 0 deletions core/src/test/java/org/everit/json/schema/loader/ClassPathAwareSchemaClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@
import static org.mockito.Mockito.when;

import java.io.InputStream;
import java.io.UncheckedIOException;

import org.everit.json.schema.ResourceLoader;
import org.json.JSONObject;
import org.json.JSONTokener;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;

import junitparams.JUnitParamsRunner;
Expand All @@ -39,6 +42,18 @@ public void delegatesUnhandledProtocolsToFallback() {
assertSame(expected, actual);
}

@Rule
public ExpectedException exception = ExpectedException.none();
@Test
public void throwsErrorOnMissingClasspathResource() {
exception.expect(UncheckedIOException.class);
exception.expectMessage("Could not find");

String url = "classpath:/bogus.json";
ClassPathAwareSchemaClient subject = new ClassPathAwareSchemaClient(fallbackClient);
subject.get(url);
}

@Test
@Parameters({
"classpath:/org/everit/jsonvalidator/constobject.json",
Expand Down