Fixing some sonar warnings

Björn Ekryd · Björn Ekryd · commit 5d515ca9c909 · 2025-12-20T22:05:58.000+01:00
diff --git a/sorter/src/main/java/sortpom/wrapper/WrapperFactoryImpl.java b/sorter/src/main/java/sortpom/wrapper/WrapperFactoryImpl.java
@@ -106,18 +106,18 @@ private void addElementsToSortOrderMap(Element element, int baseSortOrder) {
   @SuppressWarnings("unchecked")
   @Override
   public <T extends Node> Wrapper<T> create(T content) {
-    if (content instanceof Element) {
-      return (Wrapper<T>) elementWrapperCreator.createWrapper((Element) content);
+    if (content instanceof Element element) {
+      return (Wrapper<T>) elementWrapperCreator.createWrapper(element);
     }
     if (content instanceof Comment) {
       return new UnsortedWrapper<>(content);
     }
-    if (content instanceof Text) {
-      return (Wrapper<T>) textWrapperCreator.createWrapper((Text) content);
+    if (content instanceof Text text) {
+      return (Wrapper<T>) textWrapperCreator.createWrapper(text);
     }
-    if (content instanceof ProcessingInstruction && "sortpom".equals(content.getName())) {
-      return (Wrapper<T>)
-          new UnsortedWrapper<>(IgnoreSectionToken.from((ProcessingInstruction) content));
+    if (content instanceof ProcessingInstruction processingInstruction
+        && "sortpom".equals(content.getName())) {
+      return (Wrapper<T>) new UnsortedWrapper<>(IgnoreSectionToken.from(processingInstruction));
     }
     return new UnsortedWrapper<>(content);
   }
diff --git a/sorter/src/main/java/sortpom/wrapper/content/AlphabeticalSortedWrapper.java b/sorter/src/main/java/sortpom/wrapper/content/AlphabeticalSortedWrapper.java
@@ -22,8 +22,8 @@ public Element getContent() {
 
   @Override
   public boolean isBefore(Wrapper<? extends Node> wrapper) {
-    return wrapper instanceof AlphabeticalSortedWrapper
-        && isBeforeAlphabeticalSortedWrapper((AlphabeticalSortedWrapper) wrapper);
+    return wrapper instanceof AlphabeticalSortedWrapper alphabeticalsortedwrapper
+        && isBeforeAlphabeticalSortedWrapper(alphabeticalsortedwrapper);
   }
 
   private boolean isBeforeAlphabeticalSortedWrapper(AlphabeticalSortedWrapper wrapper) {
diff --git a/sorter/src/main/java/sortpom/wrapper/content/DependencySortedWrapper.java b/sorter/src/main/java/sortpom/wrapper/content/DependencySortedWrapper.java
@@ -30,8 +30,8 @@ public void setSortOrder(DependencySortOrder childElementNames) {
 
   @Override
   public boolean isBefore(Wrapper<? extends Node> wrapper) {
-    if (wrapper instanceof DependencySortedWrapper) {
-      return isBeforeDependencySortedWrapper((DependencySortedWrapper) wrapper);
+    if (wrapper instanceof DependencySortedWrapper dependencySortedWrapper) {
+      return isBeforeDependencySortedWrapper(dependencySortedWrapper);
     }
     return super.isBefore(wrapper);
   }
diff --git a/sorter/src/main/java/sortpom/wrapper/content/ExclusionSortedWrapper.java b/sorter/src/main/java/sortpom/wrapper/content/ExclusionSortedWrapper.java
@@ -30,8 +30,8 @@ public void setSortOrder(DependencySortOrder childElementNames) {
 
   @Override
   public boolean isBefore(Wrapper<? extends Node> wrapper) {
-    if (wrapper instanceof ExclusionSortedWrapper) {
-      return isBeforeExclusionSortedWrapper((ExclusionSortedWrapper) wrapper);
+    if (wrapper instanceof ExclusionSortedWrapper exclusionSortedWrapper) {
+      return isBeforeExclusionSortedWrapper(exclusionSortedWrapper);
     }
     return super.isBefore(wrapper);
   }
diff --git a/sorter/src/main/java/sortpom/wrapper/content/ExecutionSortedWrapper.java b/sorter/src/main/java/sortpom/wrapper/content/ExecutionSortedWrapper.java
@@ -42,8 +42,8 @@ public ExecutionSortedWrapper(Element element, int sortOrder) {
 
   @Override
   public boolean isBefore(Wrapper<? extends Node> wrapper) {
-    if (wrapper instanceof ExecutionSortedWrapper) {
-      return isBeforeWrapper((ExecutionSortedWrapper) wrapper);
+    if (wrapper instanceof ExecutionSortedWrapper executionSortedWrapper) {
+      return isBeforeWrapper(executionSortedWrapper);
     }
     return super.isBefore(wrapper);
   }
diff --git a/sorter/src/main/java/sortpom/wrapper/content/ModuleSortedWrapper.java b/sorter/src/main/java/sortpom/wrapper/content/ModuleSortedWrapper.java
@@ -24,8 +24,8 @@ public ModuleSortedWrapper(Element element, int sortOrder) {
 
   @Override
   public boolean isBefore(Wrapper<? extends Node> wrapper) {
-    if (wrapper instanceof ModuleSortedWrapper) {
-      return isBeforeAlphabeticalTextSortedWrapper((ModuleSortedWrapper) wrapper);
+    if (wrapper instanceof ModuleSortedWrapper moduleSortedWrapper) {
+      return isBeforeAlphabeticalTextSortedWrapper(moduleSortedWrapper);
     }
     return super.isBefore(wrapper);
   }
diff --git a/sorter/src/main/java/sortpom/wrapper/content/Phase.java b/sorter/src/main/java/sortpom/wrapper/content/Phase.java
@@ -5,7 +5,7 @@
 
 /** Keep track of all Maven standard phases and custom phases */
 interface Phase {
-  String getText();
+  String text();
 
   static int compareTo(Phase o1, Phase o2) {
     if (o1 == null) {
@@ -19,7 +19,7 @@ static int compareTo(Phase o1, Phase o2) {
     }
     if (o1 instanceof NonStandardPhase) {
       if (o2 instanceof NonStandardPhase) {
-        return o1.getText().compareTo(o2.getText());
+        return o1.text().compareTo(o2.text());
       } else {
         return 1;
       }
@@ -36,18 +36,11 @@ static Phase getPhase(String name) {
     return phase.orElse(new NonStandardPhase(name));
   }
 
-  class NonStandardPhase implements Phase {
-    private final String text;
-
+  record NonStandardPhase(String text) implements Phase {
     public NonStandardPhase(String text) {
       this.text = text.toLowerCase();
     }
 
-    @Override
-    public String getText() {
-      return text;
-    }
-
     @Override
     public String toString() {
       return "NonStandardPhase{" + "text='" + text + '\'' + '}';
@@ -102,7 +95,7 @@ static Optional<Phase> getPhase(String phase) {
           .findFirst();
     }
 
-    public String getText() {
+    public String text() {
       return text;
     }
   }
diff --git a/sorter/src/main/java/sortpom/wrapper/content/PluginSortedWrapper.java b/sorter/src/main/java/sortpom/wrapper/content/PluginSortedWrapper.java
@@ -31,8 +31,8 @@ public void setSortOrder(DependencySortOrder dependencySortOrder) {
 
   @Override
   public boolean isBefore(Wrapper<? extends Node> wrapper) {
-    if (wrapper instanceof PluginSortedWrapper) {
-      return isBeforePluginSortedWrapper((PluginSortedWrapper) wrapper);
+    if (wrapper instanceof PluginSortedWrapper pluginSortedWrapper) {
+      return isBeforePluginSortedWrapper(pluginSortedWrapper);
     }
     return super.isBefore(wrapper);
   }
diff --git a/sorter/src/main/java/sortpom/wrapper/content/SortedWrapper.java b/sorter/src/main/java/sortpom/wrapper/content/SortedWrapper.java
@@ -28,7 +28,8 @@ public Element getContent() {
 
   @Override
   public boolean isBefore(Wrapper<? extends Node> wrapper) {
-    return !(wrapper instanceof SortedWrapper) || isBeforeSortedWrapper((SortedWrapper) wrapper);
+    return !(wrapper instanceof SortedWrapper sortedWrapper)
+        || isBeforeSortedWrapper(sortedWrapper);
   }
 
   private boolean isBeforeSortedWrapper(SortedWrapper wrapper) {
diff --git a/sorter/src/test/java/sortpom/util/XmlProcessorTestUtil.java b/sorter/src/test/java/sortpom/util/XmlProcessorTestUtil.java
@@ -126,8 +126,7 @@ public HierarchyRootWrapper createFromRootElement(Element rootElement) {
             @SuppressWarnings("unchecked")
             @Override
             public <T extends Node> Wrapper<T> create(T content) {
-              if (content instanceof Element) {
-                var element = (Element) content;
+              if (content instanceof Element element) {
                 return (Wrapper<T>) new AlphabeticalSortedWrapper(element);
               }
               return new UnsortedWrapper<>(content);
diff --git a/sorter/src/test/java/sortpom/wrapper/content/PhaseTest.java b/sorter/src/test/java/sortpom/wrapper/content/PhaseTest.java
@@ -26,14 +26,14 @@ void compareStandardPhasesAndOtherPhases() {
     list.sort(Phase::compareTo);
     assertThat(arr.length, is(8));
     var i = 0;
-    assertThat(arr[i++].getText(), is("test"));
-    assertThat(arr[i++].getText(), is("site"));
-    assertThat(arr[i++].getText(), is(""));
-    assertThat(arr[i++].getText(), is("01"));
-    assertThat(arr[i++].getText(), is("a"));
-    assertThat(arr[i++].getText(), is("b"));
-    assertThat(arr[i++].getText(), is("c"));
-    assertThat(arr[i].getText(), is("clea"));
+    assertThat(arr[i++].text(), is("test"));
+    assertThat(arr[i++].text(), is("site"));
+    assertThat(arr[i++].text(), is(""));
+    assertThat(arr[i++].text(), is("01"));
+    assertThat(arr[i++].text(), is("a"));
+    assertThat(arr[i++].text(), is("b"));
+    assertThat(arr[i++].text(), is("c"));
+    assertThat(arr[i].text(), is("clea"));
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -106,18 +106,18 @@ private void addElementsToSortOrderMap(Element element, int baseSortOrder) {`
`106`	`106`	`@SuppressWarnings("unchecked")`
`107`	`107`	`@Override`
`108`	`108`	`public <T extends Node> Wrapper<T> create(T content) {`
`109`		`- if (content instanceof Element) {`
`110`		`- return (Wrapper<T>) elementWrapperCreator.createWrapper((Element) content);`
	`109`	`+ if (content instanceof Element element) {`
	`110`	`+ return (Wrapper<T>) elementWrapperCreator.createWrapper(element);`
`111`	`111`	`}`
`112`	`112`	`if (content instanceof Comment) {`
`113`	`113`	`return new UnsortedWrapper<>(content);`
`114`	`114`	`}`
`115`		`- if (content instanceof Text) {`
`116`		`- return (Wrapper<T>) textWrapperCreator.createWrapper((Text) content);`
	`115`	`+ if (content instanceof Text text) {`
	`116`	`+ return (Wrapper<T>) textWrapperCreator.createWrapper(text);`
`117`	`117`	`}`
`118`		`- if (content instanceof ProcessingInstruction && "sortpom".equals(content.getName())) {`
`119`		`- return (Wrapper<T>)`
`120`		`- new UnsortedWrapper<>(IgnoreSectionToken.from((ProcessingInstruction) content));`
	`118`	`+ if (content instanceof ProcessingInstruction processingInstruction`
	`119`	`+ && "sortpom".equals(content.getName())) {`
	`120`	`+ return (Wrapper<T>) new UnsortedWrapper<>(IgnoreSectionToken.from(processingInstruction));`
`121`	`121`	`}`
`122`	`122`	`return new UnsortedWrapper<>(content);`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ public Element getContent() {`
`22`	`22`
`23`	`23`	`@Override`
`24`	`24`	`public boolean isBefore(Wrapper<? extends Node> wrapper) {`
`25`		`- return wrapper instanceof AlphabeticalSortedWrapper`
`26`		`- && isBeforeAlphabeticalSortedWrapper((AlphabeticalSortedWrapper) wrapper);`
	`25`	`+ return wrapper instanceof AlphabeticalSortedWrapper alphabeticalsortedwrapper`
	`26`	`+ && isBeforeAlphabeticalSortedWrapper(alphabeticalsortedwrapper);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`private boolean isBeforeAlphabeticalSortedWrapper(AlphabeticalSortedWrapper wrapper) {`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ public void setSortOrder(DependencySortOrder childElementNames) {`
`30`	`30`
`31`	`31`	`@Override`
`32`	`32`	`public boolean isBefore(Wrapper<? extends Node> wrapper) {`
`33`		`- if (wrapper instanceof DependencySortedWrapper) {`
`34`		`- return isBeforeDependencySortedWrapper((DependencySortedWrapper) wrapper);`
	`33`	`+ if (wrapper instanceof DependencySortedWrapper dependencySortedWrapper) {`
	`34`	`+ return isBeforeDependencySortedWrapper(dependencySortedWrapper);`
`35`	`35`	`}`
`36`	`36`	`return super.isBefore(wrapper);`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ public ExecutionSortedWrapper(Element element, int sortOrder) {`
`42`	`42`
`43`	`43`	`@Override`
`44`	`44`	`public boolean isBefore(Wrapper<? extends Node> wrapper) {`
`45`		`- if (wrapper instanceof ExecutionSortedWrapper) {`
`46`		`- return isBeforeWrapper((ExecutionSortedWrapper) wrapper);`
	`45`	`+ if (wrapper instanceof ExecutionSortedWrapper executionSortedWrapper) {`
	`46`	`+ return isBeforeWrapper(executionSortedWrapper);`
`47`	`47`	`}`
`48`	`48`	`return super.isBefore(wrapper);`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ public ModuleSortedWrapper(Element element, int sortOrder) {`
`24`	`24`
`25`	`25`	`@Override`
`26`	`26`	`public boolean isBefore(Wrapper<? extends Node> wrapper) {`
`27`		`- if (wrapper instanceof ModuleSortedWrapper) {`
`28`		`- return isBeforeAlphabeticalTextSortedWrapper((ModuleSortedWrapper) wrapper);`
	`27`	`+ if (wrapper instanceof ModuleSortedWrapper moduleSortedWrapper) {`
	`28`	`+ return isBeforeAlphabeticalTextSortedWrapper(moduleSortedWrapper);`
`29`	`29`	`}`
`30`	`30`	`return super.isBefore(wrapper);`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`/** Keep track of all Maven standard phases and custom phases */`
`7`	`7`	`interface Phase {`
`8`		`- String getText();`
	`8`	`+ String text();`
`9`	`9`
`10`	`10`	`static int compareTo(Phase o1, Phase o2) {`
`11`	`11`	`if (o1 == null) {`
`@@ -19,7 +19,7 @@ static int compareTo(Phase o1, Phase o2) {`
`19`	`19`	`}`
`20`	`20`	`if (o1 instanceof NonStandardPhase) {`
`21`	`21`	`if (o2 instanceof NonStandardPhase) {`
`22`		`- return o1.getText().compareTo(o2.getText());`
	`22`	`+ return o1.text().compareTo(o2.text());`
`23`	`23`	`} else {`
`24`	`24`	`return 1;`
`25`	`25`	`}`
`@@ -36,18 +36,11 @@ static Phase getPhase(String name) {`
`36`	`36`	`return phase.orElse(new NonStandardPhase(name));`
`37`	`37`	`}`
`38`	`38`
`39`		`- class NonStandardPhase implements Phase {`
`40`		`- private final String text;`
`41`		`-`
	`39`	`+ record NonStandardPhase(String text) implements Phase {`
`42`	`40`	`public NonStandardPhase(String text) {`
`43`	`41`	`this.text = text.toLowerCase();`
`44`	`42`	`}`
`45`	`43`
`46`		`- @Override`
`47`		`- public String getText() {`
`48`		`- return text;`
`49`		`- }`
`50`		`-`
`51`	`44`	`@Override`
`52`	`45`	`public String toString() {`
`53`	`46`	`return "NonStandardPhase{" + "text='" + text + '\'' + '}';`
`@@ -102,7 +95,7 @@ static Optional<Phase> getPhase(String phase) {`
`102`	`95`	`.findFirst();`
`103`	`96`	`}`
`104`	`97`
`105`		`- public String getText() {`
	`98`	`+ public String text() {`
`106`	`99`	`return text;`
`107`	`100`	`}`
`108`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ public void setSortOrder(DependencySortOrder dependencySortOrder) {`
`31`	`31`
`32`	`32`	`@Override`
`33`	`33`	`public boolean isBefore(Wrapper<? extends Node> wrapper) {`
`34`		`- if (wrapper instanceof PluginSortedWrapper) {`
`35`		`- return isBeforePluginSortedWrapper((PluginSortedWrapper) wrapper);`
	`34`	`+ if (wrapper instanceof PluginSortedWrapper pluginSortedWrapper) {`
	`35`	`+ return isBeforePluginSortedWrapper(pluginSortedWrapper);`
`36`	`36`	`}`
`37`	`37`	`return super.isBefore(wrapper);`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@ public Element getContent() {`
`28`	`28`
`29`	`29`	`@Override`
`30`	`30`	`public boolean isBefore(Wrapper<? extends Node> wrapper) {`
`31`		`- return !(wrapper instanceof SortedWrapper) \|\| isBeforeSortedWrapper((SortedWrapper) wrapper);`
	`31`	`+ return !(wrapper instanceof SortedWrapper sortedWrapper)`
	`32`	`+ \|\| isBeforeSortedWrapper(sortedWrapper);`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`private boolean isBeforeSortedWrapper(SortedWrapper wrapper) {`