diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 6d140d3..d01a390 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index d32dd97..0d340d7 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5ae2566..6d605b0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -20,7 +76,7 @@
-
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 50a6664..3e04cc7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,4 @@
plugins {
- id 'checkstyle'
id 'java'
id 'jacoco'
id 'maven-publish'
@@ -154,13 +153,6 @@ tasks.withType(SpotBugsTask) {
}
}
-tasks.withType(Checkstyle) {
- reports {
- xml.enabled = false
- html.enabled = true
- }
-}
-
task release {
group = 'Publishing'
description = 'Releases new version to local maven repository.'
@@ -194,8 +186,8 @@ task pandoc(type: Exec) {
jacocoTestReport {
dependsOn(test)
reports {
- html.enabled = true
- xml.enabled = true
+ html.required = true
+ xml.required = true
}
}
diff --git a/src/main/java/net/thauvin/erik/semver/Constants.java b/src/main/java/net/thauvin/erik/semver/Constants.java
index 5a004a2..51248e7 100644
--- a/src/main/java/net/thauvin/erik/semver/Constants.java
+++ b/src/main/java/net/thauvin/erik/semver/Constants.java
@@ -39,7 +39,6 @@ package net.thauvin.erik.semver;
* @created 2016-01-13
* @since 1.0
*/
-@SuppressWarnings("WeakerAccess")
public final class Constants {
/**
* The default metadata prefix.
diff --git a/src/main/java/net/thauvin/erik/semver/Version.java b/src/main/java/net/thauvin/erik/semver/Version.java
index 8b29cec..fa0f500 100644
--- a/src/main/java/net/thauvin/erik/semver/Version.java
+++ b/src/main/java/net/thauvin/erik/semver/Version.java
@@ -44,6 +44,7 @@ import java.lang.annotation.Target;
* @created 2016-01-13
* @since 1.0
*/
+@SuppressWarnings("SameReturnValue")
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.TYPE)
public @interface Version {
diff --git a/src/main/java/net/thauvin/erik/semver/VersionInfo.java b/src/main/java/net/thauvin/erik/semver/VersionInfo.java
index c45a062..270f5e7 100644
--- a/src/main/java/net/thauvin/erik/semver/VersionInfo.java
+++ b/src/main/java/net/thauvin/erik/semver/VersionInfo.java
@@ -330,11 +330,11 @@ public class VersionInfo {
*/
public String getVersion() {
return major
- + separator
- + minor
- + separator
- + patch
- + (preRelease.length() > 0 ? preReleasePrefix + preRelease : "")
- + (buildMeta.length() > 0 ? buildMetaPrefix + buildMeta : "");
+ + separator
+ + minor
+ + separator
+ + patch
+ + (preRelease.length() > 0 ? preReleasePrefix + preRelease : "")
+ + (buildMeta.length() > 0 ? buildMetaPrefix + buildMeta : "");
}
}
diff --git a/src/main/java/net/thauvin/erik/semver/VersionProcessor.java b/src/main/java/net/thauvin/erik/semver/VersionProcessor.java
index 3e78f54..49cba2c 100644
--- a/src/main/java/net/thauvin/erik/semver/VersionProcessor.java
+++ b/src/main/java/net/thauvin/erik/semver/VersionProcessor.java
@@ -38,12 +38,7 @@ import com.github.mustachejava.MustacheFactory;
import com.github.mustachejava.MustacheNotFoundException;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import javax.annotation.processing.AbstractProcessor;
-import javax.annotation.processing.Filer;
-import javax.annotation.processing.Messager;
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.annotation.processing.RoundEnvironment;
-import javax.annotation.processing.SupportedOptions;
+import javax.annotation.processing.*;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
@@ -51,12 +46,7 @@ import javax.lang.model.element.PackageElement;
import javax.lang.model.element.TypeElement;
import javax.tools.Diagnostic;
import javax.tools.FileObject;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
+import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.HashSet;
@@ -70,7 +60,7 @@ import java.util.Set;
* @created 2016-01-13
* @since 1.0
*/
-@SuppressWarnings({ "PMD.GuardLogStatement", "PMD.BeanMembersShouldSerialize"})
+@SuppressWarnings({"PMD.GuardLogStatement", "PMD.BeanMembersShouldSerialize"})
@SupportedOptions({Constants.KAPT_KOTLIN_GENERATED_OPTION_NAME, Constants.SEMVER_PROJECT_DIR_ARG})
public class VersionProcessor extends AbstractProcessor {
private Filer filer;
@@ -97,27 +87,27 @@ public class VersionProcessor extends AbstractProcessor {
final Properties p = new Properties();
try (InputStreamReader reader = new InputStreamReader(
- Files.newInputStream(propsFile.toPath()), StandardCharsets.UTF_8)) {
+ Files.newInputStream(propsFile.toPath()), StandardCharsets.UTF_8)) {
p.load(reader);
versionInfo.setProject(
- p.getProperty(version.keysPrefix() + version.projectKey(), version.project()));
+ p.getProperty(version.keysPrefix() + version.projectKey(), version.project()));
versionInfo.setMajor(
- parseIntProperty(p, version.keysPrefix() + version.majorKey(), version.major()));
+ parseIntProperty(p, version.keysPrefix() + version.majorKey(), version.major()));
versionInfo.setMinor(
- parseIntProperty(p, version.keysPrefix() + version.minorKey(), version.minor()));
+ parseIntProperty(p, version.keysPrefix() + version.minorKey(), version.minor()));
versionInfo.setPatch(
- parseIntProperty(p, version.keysPrefix() + version.patchKey(), version.patch()));
+ parseIntProperty(p, version.keysPrefix() + version.patchKey(), version.patch()));
versionInfo.setBuildMeta(
- p.getProperty(version.keysPrefix() + version.buildMetaKey(), version.buildMeta()));
+ p.getProperty(version.keysPrefix() + version.buildMetaKey(), version.buildMeta()));
versionInfo.setBuildMetaPrefix(
- p.getProperty(version.keysPrefix() + version.buildMetaPrefixKey(), version.buildMetaPrefix()));
+ p.getProperty(version.keysPrefix() + version.buildMetaPrefixKey(), version.buildMetaPrefix()));
versionInfo.setPreRelease(
- p.getProperty(version.keysPrefix() + version.preReleaseKey(), version.preRelease()));
+ p.getProperty(version.keysPrefix() + version.preReleaseKey(), version.preRelease()));
versionInfo.setPreReleasePrefix(p.getProperty(version.keysPrefix() + version.preReleasePrefixKey(),
- version.preReleasePrefix()));
+ version.preReleasePrefix()));
versionInfo.setSeparator(
- p.getProperty(version.keysPrefix() + version.separatorKey(), version.separator()));
+ p.getProperty(version.keysPrefix() + version.separatorKey(), version.separator()));
}
} else {
final String findOrRead;
@@ -128,7 +118,7 @@ public class VersionProcessor extends AbstractProcessor {
}
error("Could not " + findOrRead + ": " + propsFile);
throw new FileNotFoundException(
- "Could not " + findOrRead + " the specified file: `" + propsFile.getAbsolutePath() + '`');
+ "Could not " + findOrRead + " the specified file: `" + propsFile.getAbsolutePath() + '`');
}
}
@@ -197,7 +187,7 @@ public class VersionProcessor extends AbstractProcessor {
if (isLocalTemplate && Constants.DEFAULT_JAVA_TEMPLATE.equals(version.template())) {
template = Constants.DEFAULT_TEMPLATE_NAME;
} else if (Constants.DEFAULT_JAVA_TEMPLATE.equals(version.template()) && Constants.KOTLIN_TYPE
- .equals(version.type())) {
+ .equals(version.type())) {
template = Constants.DEFAULT_KOTLIN_TEMPLATE;
} else {
template = version.template();
@@ -216,7 +206,7 @@ public class VersionProcessor extends AbstractProcessor {
private void log(final Diagnostic.Kind kind, final String s) {
if (messager != null) {
messager.printMessage(kind,
- '[' + VersionProcessor.class.getSimpleName() + "] " + s + System.lineSeparator());
+ '[' + VersionProcessor.class.getSimpleName() + "] " + s + System.lineSeparator());
}
}
@@ -239,7 +229,7 @@ public class VersionProcessor extends AbstractProcessor {
@SuppressFBWarnings({"PATH_TRAVERSAL_IN", "UAC_UNNECESSARY_API_CONVERSION_FILE_TO_PATH"})
private void writeTemplate(final String type, final VersionInfo versionInfo, final String template)
- throws IOException {
+ throws IOException {
final File dir = getLocalFile("");
final MustacheFactory mf = new DefaultMustacheFactory(dir);
final Mustache mustache = mf.compile(template);
@@ -269,13 +259,13 @@ public class VersionProcessor extends AbstractProcessor {
note("Could not create target directory: " + ktFile.getParentFile().getAbsolutePath());
}
try (OutputStreamWriter osw = new OutputStreamWriter(Files.newOutputStream(ktFile.toPath()),
- StandardCharsets.UTF_8)) {
+ StandardCharsets.UTF_8)) {
mustache.execute(osw, versionInfo).flush();
}
note("Generated source: " + fileName + " (" + ktFile.getParentFile().getAbsolutePath() + ')');
} else {
final FileObject jfo = filer.createSourceFile(
- versionInfo.getPackageName() + '.' + versionInfo.getClassName());
+ versionInfo.getPackageName() + '.' + versionInfo.getClassName());
try (Writer writer = jfo.openWriter()) {
mustache.execute(writer, versionInfo).flush();
}
diff --git a/src/test/java/net/thauvin/erik/semver/VersionInfoTest.java b/src/test/java/net/thauvin/erik/semver/VersionInfoTest.java
index be01241..30572e2 100644
--- a/src/test/java/net/thauvin/erik/semver/VersionInfoTest.java
+++ b/src/test/java/net/thauvin/erik/semver/VersionInfoTest.java
@@ -97,7 +97,7 @@ public class VersionInfoTest {
assertEquals(versionInfo.getVersion(), "3-2-1+001", "getVersion(3-2-1+001)");
assertEquals(versionInfo.getVersion(), versionInfo.getSemver(),
- "getVersion(3-2-1+001) = getSemver(3-2-1+001) ");
+ "getVersion(3-2-1+001) = getSemver(3-2-1+001) ");
}
@Test
@@ -175,18 +175,18 @@ public class VersionInfoTest {
assertEquals(versionInfo.getPreRelease(), version.preRelease(), "getPreRelease(preRelease)");
assertEquals(versionInfo.getPreReleasePrefix(), version.preReleasePrefix(),
- "getPreReleasePrefix(preReleasePrefix)");
+ "getPreReleasePrefix(preReleasePrefix)");
assertEquals(versionInfo.getBuildMeta(), version.buildMeta(), "getBuildMeta(buildMeta)");
assertEquals(versionInfo.getBuildMetaPrefix(), version.buildMetaPrefix(),
- "getBuildMetaPrefix(buildMetaPrefix)");
+ "getBuildMetaPrefix(buildMetaPrefix)");
assertEquals(versionInfo.getPackageName(), version.packageName(), "getPackageName(packageName)");
assertEquals(versionInfo.getVersion(),
- version.major() + "." + version.minor() + '.' + version.patch() + '-' + version.preRelease() + '+'
- + version.buildMeta(), "getVersion(version)");
+ version.major() + "." + version.minor() + '.' + version.patch() + '-' + version.preRelease() + '+'
+ + version.buildMeta(), "getVersion(version)");
assertEquals(versionInfo.getVersion(), versionInfo.getSemver(), "getVersion(version) = getSemver(version)");
diff --git a/src/test/java/net/thauvin/erik/semver/VersionProcessorTest.java b/src/test/java/net/thauvin/erik/semver/VersionProcessorTest.java
index cc77944..3f8ebe0 100644
--- a/src/test/java/net/thauvin/erik/semver/VersionProcessorTest.java
+++ b/src/test/java/net/thauvin/erik/semver/VersionProcessorTest.java
@@ -73,7 +73,7 @@ public class VersionProcessorTest {
p.setProperty("4", " 4 ");
final Method method = processor.getClass().getDeclaredMethod("parseIntProperty", Properties.class, String.class,
- int.class);
+ int.class);
method.setAccessible(true);
assertEquals(method.invoke(processor, p, "1", -1), 1, "parseIntProperty(1)");
diff --git a/src/test/java/net/thauvin/erik/semver/VersionTest.java b/src/test/java/net/thauvin/erik/semver/VersionTest.java
index 0df16dd..ed47982 100644
--- a/src/test/java/net/thauvin/erik/semver/VersionTest.java
+++ b/src/test/java/net/thauvin/erik/semver/VersionTest.java
@@ -41,7 +41,7 @@ import java.lang.annotation.Annotation;
* @created 2019-04-02
* @since 1.2.0
*/
-@SuppressWarnings({"ClassExplicitlyAnnotation"})
+@SuppressWarnings({"ClassExplicitlyAnnotation", "SameReturnValue"})
class VersionTest implements Version {
@Override
public Class annotationType() {