pom.xml(maven-pmd-plugin): update to 3.8

This also updates PMD to 5.6.1

Changelogs:
- http://www.mail-archive.com/users@maven.apache.org/msg139500.html
- https://pmd.github.io/pmd-5.5.3/overview/changelog.html
- https://pmd.github.io/pmd-5.5.4/overview/changelog.html
- https://pmd.github.io/pmd-5.5.5/overview/changelog.html
- https://pmd.github.io/pmd-5.5.6/overview/changelog.html
- https://pmd.github.io/pmd-5.5.7/overview/changelog.html
- https://pmd.github.io/pmd-5.6.0/overview/changelog.html
- https://pmd.github.io/pmd-5.6.1/overview/changelog.html

No functional changes.

Author: php-coder

pom.xml

@@ -490,10 +490,7 @@
 		<mysql.version>5.1.41</mysql.version>
 
 		<native2ascii.plugin.version>1.0-beta-1</native2ascii.plugin.version>
-		<!-- TODO: enable InvalidSlf4jMessageFormat rule again when NPE and false positives will be fixed -->
-		<pmd.plugin.version>3.7</pmd.plugin.version>
-		<!-- Dependency can be safely removed when pmd plugin will require this version -->
-		<pmd.version>5.5.2</pmd.version>
+		<pmd.plugin.version>3.8</pmd.plugin.version>
 		<resources.plugin.version>3.0.2</resources.plugin.version>
 		<robotframework-plugin.version>1.4.7</robotframework-plugin.version>
 		<robotframework-selenium.version>1.4.0.8</robotframework-selenium.version>
@@ -776,13 +773,6 @@
 						<ruleset>${basedir}/src/main/config/pmd.xml</ruleset>
 					</rulesets>
 				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>net.sourceforge.pmd</groupId>
-						<artifactId>pmd-java</artifactId>
-						<version>${pmd.version}</version>
-					</dependency>
-				</dependencies>
 			</plugin>
 
 			<plugin>

src/main/config/pmd.xml

@@ -18,10 +18,7 @@
 	<rule ref="rulesets/java/basic.xml" />
 	<rule ref="rulesets/java/strictexception.xml" />
 	<rule ref="rulesets/java/sunsecure.xml" />
-	<rule ref="rulesets/java/logging-java.xml">
-		<!-- Temporary exclude this rule because of NPE and many false positives -->
-		<exclude name="InvalidSlf4jMessageFormat" />
-	</rule>
+	<rule ref="rulesets/java/logging-java.xml" />
 	<rule ref="rulesets/java/controversial.xml">
 		<exclude name="AtLeastOneConstructor" />
 		<exclude name="OnlyOneReturn" />

src/main/java/ru/mystamps/web/controller/ImageController.java

@@ -18,6 +18,7 @@
 package ru.mystamps.web.controller;
 
 import java.io.IOException;
+import java.util.Locale;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -53,7 +54,7 @@ public void getImage(@PathVariable("id") Integer imageId, HttpServletResponse re
 		}
 
 		// TODO: set content disposition
-		response.setContentType("image/" + image.getType().toLowerCase());
+		response.setContentType("image/" + image.getType().toLowerCase(Locale.ENGLISH));
 		response.setContentLength(image.getData().length);
 
 		response.getOutputStream().write(image.getData());

src/main/java/ru/mystamps/web/service/FilesystemImagePersistenceStrategy.java

@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Locale;
 
 import javax.annotation.PostConstruct;
 
@@ -123,7 +124,7 @@ private static String generateFileName(ImageInfoDto image) {
 		return new StringBuilder()
 			.append(image.getId())
 			.append('.')
-			.append(image.getType().toLowerCase())
+			.append(image.getType().toLowerCase(Locale.ENGLISH))
 			.toString();
 	}
 

src/main/java/ru/mystamps/web/service/MailServiceImpl.java

@@ -127,7 +127,9 @@ private void sendMail(
 			// Otherwise we would use SimpleMailMessage class.
 			MimeMessagePreparator preparator = new MimeMessagePreparator() {
 				@Override
-				@SuppressWarnings("PMD.SignatureDeclareThrowsException")
+				@SuppressWarnings({
+					"PMD.SignatureDeclareThrowsException", "PMD.AccessorMethodGeneration"
+				})
 				public void prepare(MimeMessage mimeMessage) throws Exception {
 					MimeMessageHelper message = new MimeMessageHelper(mimeMessage, "UTF-8");
 					message.setValidateAddresses(true);

src/main/java/ru/mystamps/web/service/UsersActivationServiceImpl.java

@@ -121,7 +121,7 @@ public long countCreatedSince(Date date) {
 	 **/
 	private static String generateActivationKey() {
 		int actKeyLength = ValidationRules.ACT_KEY_LENGTH;
-		return RandomStringUtils.randomAlphanumeric(actKeyLength).toLowerCase();
+		return RandomStringUtils.randomAlphanumeric(actKeyLength).toLowerCase(Locale.ENLISH);
 	}
 
 }

src/main/java/ru/mystamps/web/validation/jsr303/ExistingActivationKeyValidator.java

@@ -42,9 +42,7 @@ public boolean isValid(String value, ConstraintValidatorContext ctx) {
 			return true;
 		}
 
-		boolean requestExists = usersActivationService.countByActivationKey(value) == 1;
-		
-		return requestExists;
+		return usersActivationService.countByActivationKey(value) == 1;
 	}
 
 }

src/main/java/ru/mystamps/web/validation/jsr303/NotEmptyFilenameValidator.java

@@ -39,9 +39,7 @@ public boolean isValid(MultipartFile file, ConstraintValidatorContext ctx) {
 			return true;
 		}
 
-		boolean emptyFilename = StringUtils.isEmpty(file.getOriginalFilename());
-		
-		return !emptyFilename;
+		return StringUtils.isNotEmpty(file.getOriginalFilename());
 	}
 
 }

src/main/java/ru/mystamps/web/validation/jsr303/UniqueLoginValidator.java

@@ -41,9 +41,7 @@ public boolean isValid(String value, ConstraintValidatorContext ctx) {
 			return true;
 		}
 
-		boolean loginExists = userService.countByLogin(value) > 0;
-		
-		return !loginExists;
+		return userService.countByLogin(value) == 0;
 	}
 
 }