pom.xml(maven-pmd-plugin): updated to 3.2

php-coder · php-coder · commit 30f8e70fa482 · 2014-09-28T17:03:39.000+04:00
This also updates PMD to 5.1.2 @see http://mail-archives.apache.org/mod_mbox/maven-announce/201408.mbox/%3C312099282.01406985547654.JavaMail.Dennis@Dennis-Dator%3E @see http://pmd.sourceforge.net/pmd-5.1.0/changelog.html @see http://pmd.sourceforge.net/pmd-5.1.1/changelog.html @see http://pmd.sourceforge.net/pmd-5.1.2/changelog.html No functional changes.
diff --git a/pom.xml b/pom.xml
@@ -66,7 +66,7 @@
 		<liquibase.plugin.version>3.2.0</liquibase.plugin.version>
 		<license.plugin.version>1.9.0</license.plugin.version>
 		<checkstyle.plugin.version>2.13</checkstyle.plugin.version>
-		<pmd.plugin.version>3.1</pmd.plugin.version>
+		<pmd.plugin.version>3.2</pmd.plugin.version>
 		<jacoco.plugin.version>0.6.4.201312101107</jacoco.plugin.version>
 		<coveralls.plugin.version>2.2.0</coveralls.plugin.version>
 		<javadoc.plugin.version>2.9.1</javadoc.plugin.version>
diff --git a/src/main/config/pmd.xml b/src/main/config/pmd.xml
@@ -44,6 +44,7 @@
 	</rule>
 	
 	<rule ref="rulesets/java/comments.xml">
+		<exclude name="CommentRequired" />
 		<exclude name="CommentSize" />
 	</rule>
 	
diff --git a/src/main/java/ru/mystamps/web/controller/CollectionController.java b/src/main/java/ru/mystamps/web/controller/CollectionController.java
@@ -81,6 +81,8 @@ public String showInfo(
 		return "collection/info";
 	}
 
+	// false positive
+	@SuppressWarnings("PMD.UnusedPrivateMethod")
 	private Map<String, Integer> getCountriesStatistics(Collection collection, String lang) {
 		Map<String, Integer> countriesStat = countryService.getStatisticsOf(collection, lang);
 		
diff --git a/src/main/java/ru/mystamps/web/service/FilesystemImagePersistenceStrategy.java b/src/main/java/ru/mystamps/web/service/FilesystemImagePersistenceStrategy.java
@@ -53,7 +53,7 @@ public void init() {
 		}
 		
 		if (!storageDir.canWrite()) {
-			LOG.warn(
+			LOG.warn(// NOPMD: GuardLogStatement
 				"Directory '{}' exists but doesn't writable for current user! "
 				+ "Image uploading won't work.",
 				storageDir
diff --git a/src/main/java/ru/mystamps/web/service/MailServiceImpl.java b/src/main/java/ru/mystamps/web/service/MailServiceImpl.java
@@ -92,7 +92,7 @@ public void prepare(MimeMessage mimeMessage) throws Exception {
 			mailer.send(preparator);
 			
 		} catch (MailException ex) {
-			LOG.error("Can't send mail to e-mail " + email, ex);
+			LOG.error("Can't send mail to e-mail " + email, ex); // NOPMD: GuardLogStatementJavaUtil
 		}
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,8 @@ public String showInfo(`
`81`	`81`	`return "collection/info";`
`82`	`82`	`}`
`83`	`83`
	`84`	`+ // false positive`
	`85`	`+ @SuppressWarnings("PMD.UnusedPrivateMethod")`
`84`	`86`	`private Map<String, Integer> getCountriesStatistics(Collection collection, String lang) {`
`85`	`87`	`Map<String, Integer> countriesStat = countryService.getStatisticsOf(collection, lang);`
`86`	`88`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void init() {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`if (!storageDir.canWrite()) {`
`56`		`- LOG.warn(`
	`56`	`+ LOG.warn(// NOPMD: GuardLogStatement`
`57`	`57`	`"Directory '{}' exists but doesn't writable for current user! "`
`58`	`58`	`+ "Image uploading won't work.",`
`59`	`59`	`storageDir`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public void prepare(MimeMessage mimeMessage) throws Exception {`
`92`	`92`	`mailer.send(preparator);`
`93`	`93`
`94`	`94`	`} catch (MailException ex) {`
`95`		`- LOG.error("Can't send mail to e-mail " + email, ex);`
	`95`	`+ LOG.error("Can't send mail to e-mail " + email, ex); // NOPMD: GuardLogStatementJavaUtil`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`