From 5683ff853cfe45046be821d5263b1f295432af2d Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 25 Jan 2016 11:57:18 -0800
Subject: [PATCH] PMD optimizations.

---
 build.gradle                                  |  2 +-
 example/example.iml                           |  2 +-
 .../erik/semver/example/GeneratedVersion.java | 34 ++++++++++++++++---
 semver.ipr                                    |  6 ++--
 .../net/thauvin/erik/semver/Constants.java    |  2 +-
 .../net/thauvin/erik/semver/VersionInfo.java  |  6 ++--
 .../thauvin/erik/semver/VersionProcessor.java |  4 +--
 src/main/resources/version.vm                 | 32 +++++++++++++++--
 8 files changed, 70 insertions(+), 18 deletions(-)

diff --git a/build.gradle b/build.gradle
index eb34b76..8436ed6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -69,7 +69,7 @@ bintray {
 	user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
 	key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
 	publications = ['MyPublication']
-	dryRun = false
+	dryRun = true
 	pkg {
 		repo = 'maven'
 		name = mavenName
diff --git a/example/example.iml b/example/example.iml
index 2a1096e..bbfd182 100644
--- a/example/example.iml
+++ b/example/example.iml
@@ -19,7 +19,7 @@
     <orderEntry type="library" name="Gradle: org.apache.velocity:velocity:1.7" level="project" />
     <orderEntry type="library" name="Gradle: commons-collections:commons-collections:3.2.1" level="project" />
     <orderEntry type="library" name="Gradle: commons-lang:commons-lang:2.4" level="project" />
-    <orderEntry type="library" name="Gradle: net.thauvin.erik:semver:0.9.0-beta" level="project" />
+    <orderEntry type="library" name="Gradle: net.thauvin.erik:semver:0.9.1-beta" level="project" />
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">
diff --git a/example/src/generated/java/net/thauvin/erik/semver/example/GeneratedVersion.java b/example/src/generated/java/net/thauvin/erik/semver/example/GeneratedVersion.java
index 78eb5d2..aa8a26c 100644
--- a/example/src/generated/java/net/thauvin/erik/semver/example/GeneratedVersion.java
+++ b/example/src/generated/java/net/thauvin/erik/semver/example/GeneratedVersion.java
@@ -13,7 +13,7 @@ import java.util.Date;
  */
 public final class GeneratedVersion {
 	private final static String buildmeta = "";
-	private final static Date date = new Date(1453601787705L);
+	private final static Date date = new Date(1453751280926L);
 	private final static int major = 3;
 	private final static int minor = 1;
 	private final static int patch = 37;
@@ -30,12 +30,28 @@ public final class GeneratedVersion {
 	}
 
 	/**
-	 * Returns the full version.
+	 * Returns the full version string.
+	 * <p>
+	 * Formatted as:
+	 * <blockquote>
+	 * <code>MAJOR.MINOR.PATCH[-PRERELEASE][+BUILDMETADATA]</code>
+	 * </blockquote>
+	 * <p>
+	 * For example:
+	 * <ul>
+	 * <li><code>1.0.0</code></li>
+	 * <li><code>1.0.0-beta</code></li>
+	 * <li><code>1.0.0+20160124144700</code></li>
+	 * <li><code>1.0.0-alpha+001</code></li>
+	 * </ul>
 	 *
-	 * @return The full version string.
+	 * @return The version string.
 	 */
 	public static String getVersion() {
-		return "" + getMajor() + '.' + getMinor() + '.' + getPatch() + getPreRelease() + getBuildMetadata();
+		return Integer.toString(getMajor()) + '.'
+               + Integer.toString(getMinor()) + '.'
+               + Integer.toString(getPatch())
+               + getPreRelease() + getBuildMetadata();
 	}
 
 	/**
@@ -99,4 +115,14 @@ public final class GeneratedVersion {
 
 		return "";
 	}
+	
+	/**
+	 * Disables the default constructor.
+	 *
+	 * @throws UnsupportedOperationException if the constructor is called.
+	 */
+	private GeneratedVersion()
+			throws UnsupportedOperationException {
+		throw new UnsupportedOperationException("Illegal constructor call.");
+	}
 }
\ No newline at end of file
diff --git a/semver.ipr b/semver.ipr
index dcda15c..d4e0451 100644
--- a/semver.ipr
+++ b/semver.ipr
@@ -357,13 +357,13 @@
         <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-lang/commons-lang/2.4/2b8c4b3035e45520ef42033e823c7d33e4b4402c/commons-lang-2.4-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Gradle: net.thauvin.erik:semver:0.9.0-beta">
+    <library name="Gradle: net.thauvin.erik:semver:0.9.1-beta">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/net/thauvin/erik/semver/0.9.0-beta/semver-0.9.0-beta.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/net/thauvin/erik/semver/0.9.1-beta/semver-0.9.1-beta.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/net/thauvin/erik/semver/0.9.0-beta/semver-0.9.0-beta-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/net/thauvin/erik/semver/0.9.1-beta/semver-0.9.1-beta-sources.jar!/" />
       </SOURCES>
     </library>
     <library name="Gradle: org.apache.velocity:velocity:1.7">
diff --git a/src/main/java/net/thauvin/erik/semver/Constants.java b/src/main/java/net/thauvin/erik/semver/Constants.java
index bc9f0db..9e6f587 100644
--- a/src/main/java/net/thauvin/erik/semver/Constants.java
+++ b/src/main/java/net/thauvin/erik/semver/Constants.java
@@ -108,7 +108,7 @@ public final class Constants
 	/**
 	 * Disables the default constructor.
 	 *
-	 * @throws UnsupportedOperationException if an error occurred. if the constructor is called.
+	 * @throws UnsupportedOperationException if the constructor is called.
 	 */
 	private Constants()
 			throws UnsupportedOperationException
diff --git a/src/main/java/net/thauvin/erik/semver/VersionInfo.java b/src/main/java/net/thauvin/erik/semver/VersionInfo.java
index e77f71b..6da9672 100644
--- a/src/main/java/net/thauvin/erik/semver/VersionInfo.java
+++ b/src/main/java/net/thauvin/erik/semver/VersionInfo.java
@@ -207,7 +207,7 @@ public class VersionInfo
 	 *
 	 * @param project The new project name.
 	 */
-	public void setProject(String project)
+	public void setProject(final String project)
 	{
 		this.project = project;
 	}
@@ -230,7 +230,7 @@ public class VersionInfo
 	 */
 	public String getVersion()
 	{
-		return "" + major + '.' + minor + '.' + patch + (prerelease.length() > 0 ? '-' + prerelease : "") + (
-				buildmeta.length() > 0 ? '+' + buildmeta : "");
+		return Integer.toString(major) + '.' + Integer.toString(minor) + '.' + Integer.toString(patch) + (
+				prerelease.length() > 0 ? '-' + prerelease : "") + (buildmeta.length() > 0 ? '+' + buildmeta : "");
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/thauvin/erik/semver/VersionProcessor.java b/src/main/java/net/thauvin/erik/semver/VersionProcessor.java
index 3228ec1..2100156 100644
--- a/src/main/java/net/thauvin/erik/semver/VersionProcessor.java
+++ b/src/main/java/net/thauvin/erik/semver/VersionProcessor.java
@@ -170,7 +170,7 @@ public class VersionProcessor extends AbstractProcessor
 					}
 					catch (IOException e)
 					{
-						error("IOException occurred while running annotation processor", e);
+						error("IOException occurred while running the annotation processor", e);
 					}
 				}
 			}
@@ -192,7 +192,7 @@ public class VersionProcessor extends AbstractProcessor
 	{
 		try
 		{
-			return Integer.parseInt(p.getProperty(property, "" + defaultValue));
+			return Integer.parseInt(p.getProperty(property, Integer.toString(defaultValue)));
 		}
 		catch (NumberFormatException ignore)
 		{
diff --git a/src/main/resources/version.vm b/src/main/resources/version.vm
index 5c4d863..23da53b 100644
--- a/src/main/resources/version.vm
+++ b/src/main/resources/version.vm
@@ -30,12 +30,28 @@ public final class ${className} {
 	}
 
 	/**
-	 * Returns the full version.
+	 * Returns the full version string.
+	 * <p>
+	 * Formatted as:
+	 * <blockquote>
+	 * <code>MAJOR.MINOR.PATCH[-PRERELEASE][+BUILDMETADATA]</code>
+	 * </blockquote>
+	 * <p>
+	 * For example:
+	 * <ul>
+	 * <li><code>1.0.0</code></li>
+	 * <li><code>1.0.0-beta</code></li>
+	 * <li><code>1.0.0+20160124144700</code></li>
+	 * <li><code>1.0.0-alpha+001</code></li>
+	 * </ul>
 	 *
-	 * @return The full version string.
+	 * @return The version string.
 	 */
 	public static String getVersion() {
-		return "" + getMajor() + '.' + getMinor() + '.' + getPatch() + getPreRelease() + getBuildMetadata();
+		return Integer.toString(getMajor()) + '.'
+               + Integer.toString(getMinor()) + '.'
+               + Integer.toString(getPatch())
+               + getPreRelease() + getBuildMetadata();
 	}
 
 	/**
@@ -99,4 +115,14 @@ public final class ${className} {
 
 		return "";
 	}
+	
+	/**
+	 * Disables the default constructor.
+	 *
+	 * @throws UnsupportedOperationException if the constructor is called.
+	 */
+	private ${className}()
+			throws UnsupportedOperationException {
+		throw new UnsupportedOperationException("Illegal constructor call.");
+	}
 }
\ No newline at end of file