Merge pull request #2 from mpbalmeida/1.x-releases

Release v1.0.2

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
 <dependency>
   <groupId>br.com.faroltech.vraptor</groupId>
   <artifactId>vraptor-thymeleaf</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
 </dependency>
 ```
 

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.faroltech.vraptor</groupId>
 	<artifactId>vraptor-thymeleaf</artifactId>
-	<version>1.0.1</version>
+	<version>1.0.2</version>
 
 	<licenses>
 		<license>
@@ -86,6 +86,16 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
@@ -115,7 +125,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-gpg-plugin</artifactId>
-				<version>1.5</version>
+				<version>1.6</version>
 				<executions>
 					<execution>
 						<id>sign-artifacts</id>
@@ -129,7 +139,7 @@
 			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
 				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
+				<version>1.6.8</version>
 				<extensions>true</extensions>
 				<configuration>
 					<serverId>ossrh</serverId>

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);
 	}

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,24 +28,20 @@ protected Map<String, String> resolveMessagesForTemplate(String template, ITempl
 		List<String> 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);
 	}
 
 	private File createFileProperties(List<String> 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<String> computeMessageResourceNamesFromBa
 	private static List<String> computeMessageResourceNamesFromBase(
             final String resourceBaseName, final Locale locale) {
 
-        final List<String> resourceNames = new ArrayList<String>(5);
+        final List<String> resourceNames = new ArrayList<>(5);
 
         if (StringUtils.isEmptyOrWhitespace(locale.getLanguage())) {
             throw new TemplateProcessingException(

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;
 	}
 
 }