Fixed short method names warning.

jenkinsci · May 15, 2018 · aebf99e · aebf99e
1 parent cb183f0
commit aebf99e
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 19 deletions.
diff --git a/src/main/java/edu/hm/hafner/analysis/Issue.java b/src/main/java/edu/hm/hafner/analysis/Issue.java
@@ -390,7 +390,7 @@ public String getFileName() {
      *         the file name to set
      */
     public void setFileName(@CheckForNull final String fileName) {
-        this.fileName = TreeString.of(StringUtils.stripToEmpty(fileName));
+        this.fileName = TreeString.valueOf(StringUtils.stripToEmpty(fileName));
     }
 
     /**
@@ -503,7 +503,7 @@ public String getPackageName() {
      *         the name of the package
      */
     public void setPackageName(@CheckForNull final String packageName) {
-        this.packageName = TreeString.of(StringUtils.stripToEmpty(packageName));
+        this.packageName = TreeString.valueOf(StringUtils.stripToEmpty(packageName));
     }
 
     /**

diff --git a/src/main/java/edu/hm/hafner/analysis/IssueBuilder.java b/src/main/java/edu/hm/hafner/analysis/IssueBuilder.java
@@ -190,7 +190,7 @@ public Issue build() {
         Issue issue;
         if (priority != null && severity == null) {
             issue = new Issue(fileName, lineStart, lineEnd, columnStart, columnEnd, lineRanges, category, type,
-                    packageName, moduleName, Severity.of(priority), message, description, origin, reference, fingerprint,
+                    packageName, moduleName, Severity.valueOf(priority), message, description, origin, reference, fingerprint,
                     additionalProperties, id);
         }
         else {

diff --git a/src/main/java/edu/hm/hafner/analysis/Report.java b/src/main/java/edu/hm/hafner/analysis/Report.java
@@ -314,7 +314,7 @@ public int getDuplicatesSize() {
      * @return total number of issues
      */
     public int getSizeOf(final String severity) {
-        return getSizeOf(Severity.of(severity));
+        return getSizeOf(Severity.valueOf(severity));
     }
 
     /**

diff --git a/src/main/java/edu/hm/hafner/analysis/Severity.java b/src/main/java/edu/hm/hafner/analysis/Severity.java
@@ -31,7 +31,7 @@ public class Severity implements Serializable {
      *         the priority
      * @return the severity
      */
-    public static Severity of(final Priority priority) {
+    public static Severity valueOf(final Priority priority) {
         if (priority == Priority.HIGH) {
             return WARNING_HIGH;
         }
@@ -52,7 +52,7 @@ public static Severity of(final Priority priority) {
      *         the name of the severity
      * @return the severity
      */
-    public static Severity of(final String name) {
+    public static Severity valueOf(final String name) {
         if (ERROR.equalsIgnoreCase(name)) {
             return ERROR;
         }

diff --git a/src/main/java/edu/hm/hafner/util/TreeString.java b/src/main/java/edu/hm/hafner/util/TreeString.java
@@ -150,8 +150,7 @@ public boolean isBlank() {
      *
      * @return the new {@link TreeString}
      */
-    @SuppressWarnings("PMD.ShortMethodName")
-    public static TreeString of(final String string) {
+    public static TreeString valueOf(final String string) {
         return new TreeString(null, string);
     }
 }
diff --git a/src/test/java/edu/hm/hafner/analysis/SeverityTest.java b/src/test/java/edu/hm/hafner/analysis/SeverityTest.java
@@ -25,19 +25,19 @@ void shouldCreateNewSeverityThatOverridesEqualsAndToString() {
 
     @Test
     void shouldReturnLinkToConstants() {
-        assertThat(Severity.of(Priority.HIGH)).isSameAs(Severity.WARNING_HIGH);
-        assertThat(Severity.of(Priority.NORMAL)).isSameAs(Severity.WARNING_NORMAL);
-        assertThat(Severity.of(Priority.LOW)).isSameAs(Severity.WARNING_LOW);
+        assertThat(Severity.valueOf(Priority.HIGH)).isSameAs(Severity.WARNING_HIGH);
+        assertThat(Severity.valueOf(Priority.NORMAL)).isSameAs(Severity.WARNING_NORMAL);
+        assertThat(Severity.valueOf(Priority.LOW)).isSameAs(Severity.WARNING_LOW);
 
-        assertThatThrownBy(() -> Severity.of((Priority) null)).isInstanceOf(NullPointerException.class);
+        assertThatThrownBy(() -> Severity.valueOf((Priority) null)).isInstanceOf(NullPointerException.class);
 
-        assertThat(Severity.of("error")).isSameAs(Severity.ERROR);
-        assertThat(Severity.of("high")).isSameAs(Severity.WARNING_HIGH);
-        assertThat(Severity.of("normal")).isSameAs(Severity.WARNING_NORMAL);
-        assertThat(Severity.of("low")).isSameAs(Severity.WARNING_LOW);
+        assertThat(Severity.valueOf("error")).isSameAs(Severity.ERROR);
+        assertThat(Severity.valueOf("high")).isSameAs(Severity.WARNING_HIGH);
+        assertThat(Severity.valueOf("normal")).isSameAs(Severity.WARNING_NORMAL);
+        assertThat(Severity.valueOf("low")).isSameAs(Severity.WARNING_LOW);
 
         String name = "severity";
-        assertThat(Severity.of(name)).isEqualTo(new Severity(name));
+        assertThat(Severity.valueOf(name)).isEqualTo(new Severity(name));
 
 
     }

diff --git a/src/test/java/edu/hm/hafner/analysis/assertj/IssueAssert.java b/src/test/java/edu/hm/hafner/analysis/assertj/IssueAssert.java
@@ -124,7 +124,7 @@ public IssueAssert hasType(final String type) {
     public IssueAssert hasPriority(final Priority priority) {
         isNotNull();
 
-        if (!Objects.equals(actual.getSeverity(), Severity.of(priority))) {
+        if (!Objects.equals(actual.getSeverity(), Severity.valueOf(priority))) {
             failWithMessage(EXPECTED_BUT_WAS_MESSAGE, "priority", actual, priority, actual.getSeverity());
         }
 

diff --git a/src/test/java/edu/hm/hafner/util/TreeStringBuilderTest.java b/src/test/java/edu/hm/hafner/util/TreeStringBuilderTest.java
@@ -31,7 +31,7 @@ void shouldCreateSimpleTreeStringsWithBuilder() {
 
         // Utility methods:
         assertThat(builder.intern("").isBlank()).isTrue();
-        assertThat(TreeString.of("foo/bar/zot")).hasToString("foo/bar/zot");
+        assertThat(TreeString.valueOf("foo/bar/zot")).hasToString("foo/bar/zot");
     }
 
     /**