diff --git a/README.md b/README.md
index 2c95744..22c630a 100644
--- a/README.md
+++ b/README.md
@@ -11,11 +11,11 @@ This project was built using:
Since `1.0.1` you do not need to provide a thymeleaf version in your project.
-```
+```xml
br.com.faroltech.vraptor
vraptor-thymeleaf
- 1.0.1
+ 1.0.2
```
diff --git a/pom.xml b/pom.xml
index 15a46bc..2797795 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
4.0.0
br.com.faroltech.vraptor
vraptor-thymeleaf
- 1.0.1
+ 1.0.2
@@ -86,6 +86,16 @@
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.8.1
+
+ 1.8
+ 1.8
+
+
+
org.apache.maven.plugins
maven-source-plugin
@@ -115,7 +125,7 @@
org.apache.maven.plugins
maven-gpg-plugin
- 1.5
+ 1.6
sign-artifacts
@@ -129,7 +139,7 @@
org.sonatype.plugins
nexus-staging-maven-plugin
- 1.6.7
+ 1.6.8
true
ossrh
diff --git a/src/main/java/br/com/faroltech/vraptor/vraptor_thymeleaf/result/ThymeleafPageResult.java b/src/main/java/br/com/faroltech/vraptor/vraptor_thymeleaf/result/ThymeleafPageResult.java
index de5b7d4..8ccd69f 100644
--- a/src/main/java/br/com/faroltech/vraptor/vraptor_thymeleaf/result/ThymeleafPageResult.java
+++ b/src/main/java/br/com/faroltech/vraptor/vraptor_thymeleaf/result/ThymeleafPageResult.java
@@ -29,6 +29,7 @@ public class ThymeleafPageResult extends DefaultPageResult {
/**
* @deprecated CDI eyes only
*/
+ @Deprecated
protected ThymeleafPageResult() {
super(null, null, null, null, null);
}
diff --git a/src/main/java/br/com/faroltech/vraptor/vraptor_thymeleaf/util/CustomMessageResolver.java b/src/main/java/br/com/faroltech/vraptor/vraptor_thymeleaf/util/CustomMessageResolver.java
index e0cff8b..2adac63 100644
--- a/src/main/java/br/com/faroltech/vraptor/vraptor_thymeleaf/util/CustomMessageResolver.java
+++ b/src/main/java/br/com/faroltech/vraptor/vraptor_thymeleaf/util/CustomMessageResolver.java
@@ -9,12 +9,16 @@
import java.util.Map;
import java.util.Properties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.thymeleaf.exceptions.TemplateProcessingException;
import org.thymeleaf.messageresolver.StandardMessageResolver;
import org.thymeleaf.templateresource.ITemplateResource;
import org.thymeleaf.util.StringUtils;
public class CustomMessageResolver extends StandardMessageResolver {
+
+ private static final Logger logger = LoggerFactory.getLogger(CustomMessageResolver.class);
private static final String PROPERTIES_FILE_EXTENSION = ".properties";
@@ -24,16 +28,12 @@ protected Map resolveMessagesForTemplate(String template, ITempl
List computeMessageResourceNamesFromBase = computeMessageResourceNamesFromBase("messages", locale);
File file = createFileProperties(computeMessageResourceNamesFromBase);
if (file != null) {
- FileInputStream fis = null;
- try {
+ try(FileInputStream fis = new FileInputStream(file)) {
Properties properties = new Properties();
- fis = new FileInputStream(file);
properties.load(fis);
setDefaultMessages(properties);
- } catch (Throwable t) {
-
- } finally {
- try { fis.close(); } catch (Exception e) {}
+ } catch (Exception t) {
+ logger.error("Failed to resolve messages for template", t);
}
}
return super.resolveMessagesForTemplate(template, templateResource, locale);
@@ -41,7 +41,7 @@ protected Map resolveMessagesForTemplate(String template, ITempl
private File createFileProperties(List computeMessageResourceNamesFromBase) {
ClassLoader classLoader = getClass().getClassLoader();
- File file = null;
+ File file;
for (String string : computeMessageResourceNamesFromBase) {
URL resource = classLoader.getResource(string);
if (resource != null) {
@@ -57,7 +57,7 @@ private File createFileProperties(List computeMessageResourceNamesFromBa
private static List computeMessageResourceNamesFromBase(
final String resourceBaseName, final Locale locale) {
- final List resourceNames = new ArrayList(5);
+ final List resourceNames = new ArrayList<>(5);
if (StringUtils.isEmptyOrWhitespace(locale.getLanguage())) {
throw new TemplateProcessingException(
diff --git a/src/main/java/br/com/faroltech/vraptor/vraptor_thymeleaf/util/ThymeleafPathResolver.java b/src/main/java/br/com/faroltech/vraptor/vraptor_thymeleaf/util/ThymeleafPathResolver.java
index 7641a5e..e621896 100644
--- a/src/main/java/br/com/faroltech/vraptor/vraptor_thymeleaf/util/ThymeleafPathResolver.java
+++ b/src/main/java/br/com/faroltech/vraptor/vraptor_thymeleaf/util/ThymeleafPathResolver.java
@@ -11,9 +11,13 @@
@Specializes
public class ThymeleafPathResolver extends DefaultPathResolver {
+ private static final String ENCODING = "UTF-8";
+ private static final Long CACHE_TIME = 3600000L;
+
/**
* @deprecated CDI eyes only
*/
+ @Deprecated
protected ThymeleafPathResolver() {
this(null);
}
@@ -38,11 +42,11 @@ protected TemplateMode getTemplateMode() {
}
protected Long getCache() {
- return 3600000L;
+ return CACHE_TIME;
}
protected String getCharacterEncoding() {
- return "UTF-8";
+ return ENCODING;
}
}