Skip to content

Commit e488ccb

Browse files
authored
Merge pull request #23 from dai0304/feature/handle-exception-in-s3-operation
Add exception handling in S3TemplateResourceResolver
2 parents b2679d9 + b4c71db commit e488ccb

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

spar-wings-thymeleaf-s3/src/main/java/jp/xet/sparwings/thymeleaf/s3/S3TemplateResourceResolver.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
import java.util.Objects;
2020

2121
import lombok.RequiredArgsConstructor;
22-
23-
import org.slf4j.Logger;
24-
import org.slf4j.LoggerFactory;
22+
import lombok.extern.slf4j.Slf4j;
2523

2624
import org.thymeleaf.TemplateProcessingParameters;
2725
import org.thymeleaf.resourceresolver.IResourceResolver;
@@ -36,11 +34,10 @@
3634
* @version $Id$
3735
* @author fd0
3836
*/
37+
@Slf4j
3938
@RequiredArgsConstructor
4039
public class S3TemplateResourceResolver implements IResourceResolver {
4140

42-
private static Logger logger = LoggerFactory.getLogger(S3TemplateResourceResolver.class);
43-
4441
private final AmazonS3 s3;
4542

4643
private final String bucketName;
@@ -58,11 +55,13 @@ public InputStream getResourceAsStream(TemplateProcessingParameters templateProc
5855
return s3.getObject(bucketName, resourceName).getObjectContent();
5956
} catch (AmazonS3Exception e) {
6057
if (Objects.equals(e.getErrorCode(), "NoSuchKey")) {
61-
logger.trace(e.getMessage());
58+
log.trace(e.getMessage());
6259
} else {
63-
logger.warn(e.getMessage());
60+
log.warn(e.getMessage());
6461
}
65-
return null;
62+
} catch (Exception e) { // NOPMD
63+
log.warn("Unexpected", e);
6664
}
65+
return null;
6766
}
6867
}

0 commit comments

Comments
 (0)