Skip to content

Added inputStream method to ITemplateResources #198

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

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

Added inputStream method to ITemplateResources #198

Show file tree
Hide file tree
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
13 changes: 11 additions & 2 deletions .../src/main/java/org/thymeleaf/spring3/templateresource/SpringResourceTemplateResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@ public boolean exists() {

public Reader reader() throws IOException {

// Will never return null, but an IOException if not found
final InputStream inputStream = this.resource.getInputStream();
final InputStream inputStream = inputStream();

if (!StringUtils.isEmptyOrWhitespace(this.characterEncoding)) {
return new BufferedReader(new InputStreamReader(new BufferedInputStream(inputStream), this.characterEncoding));
Expand All @@ -110,6 +109,11 @@ public Reader reader() throws IOException {

}

public InputStream inputStream() throws IOException {
// Will never return null, but an IOException if not found
return this.resource.getInputStream();
}

public ITemplateResource relative(final String relativeLocation) {
final Resource relativeResource;
try {
Expand Down Expand Up @@ -195,6 +199,11 @@ public Reader reader() throws IOException {
throw new IOException("Invalid relative resource", this.ioException);
}

@Override
public InputStream inputStream() throws IOException {
throw new IOException("Invalid relative resource", this.ioException);
}

@Override
public ITemplateResource relative(final String relativeLocation) {
return this;
Expand Down
12 changes: 11 additions & 1 deletion .../src/main/java/org/thymeleaf/spring4/templateresource/SpringResourceTemplateResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public boolean exists() {
public Reader reader() throws IOException {

// Will never return null, but an IOException if not found
final InputStream inputStream = this.resource.getInputStream();
final InputStream inputStream = inputStream();

if (!StringUtils.isEmptyOrWhitespace(this.characterEncoding)) {
return new BufferedReader(new InputStreamReader(new BufferedInputStream(inputStream), this.characterEncoding));
Expand All @@ -110,6 +110,11 @@ public Reader reader() throws IOException {

}

public InputStream inputStream() throws IOException {
// Will never return null, but an IOException if not found
return this.resource.getInputStream();
}

public ITemplateResource relative(final String relativeLocation) {
final Resource relativeResource;
try {
Expand Down Expand Up @@ -195,6 +200,11 @@ public Reader reader() throws IOException {
throw new IOException("Invalid relative resource", this.ioException);
}

@Override
public InputStream inputStream() throws IOException {
throw new IOException("Invalid relative resource", this.ioException);
}

@Override
public ITemplateResource relative(final String relativeLocation) {
return this;
Expand Down
13 changes: 11 additions & 2 deletions .../src/main/java/org/thymeleaf/spring5/templateresource/SpringResourceTemplateResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@ public boolean exists() {

public Reader reader() throws IOException {

// Will never return null, but an IOException if not found
final InputStream inputStream = this.resource.getInputStream();
final InputStream inputStream = inputStream();

if (!StringUtils.isEmptyOrWhitespace(this.characterEncoding)) {
return new BufferedReader(new InputStreamReader(new BufferedInputStream(inputStream), this.characterEncoding));
Expand All @@ -110,6 +109,11 @@ public Reader reader() throws IOException {

}

public InputStream inputStream() throws IOException {
// Will never return null, but an IOException if not found
return this.resource.getInputStream();
}

public ITemplateResource relative(final String relativeLocation) {
final Resource relativeResource;
try {
Expand Down Expand Up @@ -195,6 +199,11 @@ public Reader reader() throws IOException {
throw new IOException("Invalid relative resource", this.ioException);
}

@Override
public InputStream inputStream() throws IOException {
throw new IOException("Invalid relative resource", this.ioException);
}

@Override
public ITemplateResource relative(final String relativeLocation) {
return this;
Expand Down