Skip to content
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

remove nulls from HttpServletRequestFake #1375

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

remove nulls from HttpServletRequestFake #1375

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions src/main/java/org/takes/rs/RsXslt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import org.cactoos.io.WriterTo;
import org.cactoos.scalar.Unchecked;
import org.takes.Response;
import org.takes.misc.Opt;

/**
* Response that converts XML into HTML using attached XSL stylesheet.
Expand Down Expand Up @@ -236,15 +237,17 @@ private static byte[] consume(final InputStream input) throws IOException {
*/
private static Source stylesheet(final TransformerFactory factory,
final Source xml) throws TransformerConfigurationException {
final Source stylesheet = factory.getAssociatedStylesheet(
xml, null, null, null
final Opt<Source> stylesheet = new Opt.Single<>(
factory.getAssociatedStylesheet(
xml, null, null, null
)
);
if (stylesheet == null) {
if (!stylesheet.has()) {
throw new IllegalArgumentException(
"No associated stylesheet found in XML"
);
}
return stylesheet;
return stylesheet.get();
}

/**
Expand Down
Loading