chore: Fix pmd performance rules (#65)

* chore: Fix PMD performance rules - AddEmptyString * chore: Fix PMD performance rules - AppendCharacterWithChar * chore: Fix PMD performance rules - StringToString
nordic-institute · Oct 4, 2024 · 31d4832 · 31d4832
1 parent 86679bf
commit 31d4832
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 22 deletions.
diff --git a/config/pmd/custom-ruleset.xml b/config/pmd/custom-ruleset.xml
@@ -90,11 +90,8 @@
     </rule>
 
     <rule ref="category/java/performance.xml">
-        <exclude name="AddEmptyString"/>
         <exclude name="AvoidInstantiatingObjectsInLoops"/>
-        <exclude name="AppendCharacterWithChar"/>
         <exclude name="ConsecutiveAppendsShouldReuse"/>
-        <exclude name="StringToString"/>
     </rule>
 
     <rule ref="category/java/security.xml"/>

diff --git a/...catalog-collector/src/main/java/org/niis/xroad/catalog/collector/util/ClientTypeUtil.java b/...catalog-collector/src/main/java/org/niis/xroad/catalog/collector/util/ClientTypeUtil.java
@@ -43,18 +43,18 @@ public static String toString(ClientType c) {
     public static String toString(XRoadIdentifierType c) {
         StringBuilder sb = new StringBuilder(128);
         sb.append(c.getObjectType());
-        sb.append(":");
+        sb.append(':');
         sb.append(c.getXRoadInstance());
-        sb.append("/");
+        sb.append('/');
         sb.append(c.getMemberClass());
-        sb.append("/");
+        sb.append('/');
         sb.append(c.getMemberCode());
-        sb.append("/");
+        sb.append('/');
         sb.append(c.getSubsystemCode());
         if (c.getObjectType().equals(XRoadObjectType.SERVICE)) {
-            sb.append("/");
+            sb.append('/');
             sb.append(c.getServiceCode());
-            sb.append("/");
+            sb.append('/');
             sb.append(c.getServiceVersion());
         }
         return sb.toString();

diff --git a/...catalog-collector/src/main/java/org/niis/xroad/catalog/collector/util/MethodListUtil.java b/...catalog-collector/src/main/java/org/niis/xroad/catalog/collector/util/MethodListUtil.java
@@ -61,9 +61,9 @@ public static List<XRoadRestServiceIdentifierType> methodListFromResponse(Client
                                                                               String subsystemCode,
                                                                               CatalogService catalogService) {
         final String url = new StringBuilder().append(host).append("/r1/")
-                .append(clientType.getId().getXRoadInstance()).append("/")
-                .append(clientType.getId().getMemberClass()).append("/")
-                .append(clientType.getId().getMemberCode()).append("/")
+                .append(clientType.getId().getXRoadInstance()).append('/')
+                .append(clientType.getId().getMemberClass()).append('/')
+                .append(clientType.getId().getMemberCode()).append('/')
                 .append(clientType.getId().getSubsystemCode()).append("/listMethods").toString();
 
         String xRoadClientHeader = createHeader(xRoadInstance, memberClass, memberCode, subsystemCode);
@@ -112,9 +112,9 @@ public static String openApiFromResponse(ClientType clientType,
                                              String subsystemCode,
                                              CatalogService catalogService) {
         final String url = new StringBuilder().append(host).append("/r1/")
-                .append(clientType.getId().getXRoadInstance()).append("/")
-                .append(clientType.getId().getMemberClass()).append("/")
-                .append(clientType.getId().getMemberCode()).append("/")
+                .append(clientType.getId().getXRoadInstance()).append('/')
+                .append(clientType.getId().getMemberClass()).append('/')
+                .append(clientType.getId().getMemberCode()).append('/')
                 .append(clientType.getId().getSubsystemCode()).append("/getOpenAPI?serviceCode=")
                 .append(clientType.getId().getServiceCode()).toString();
 
@@ -137,9 +137,9 @@ public static List<Endpoint> getEndpointList(
     private static String createHeader(String xRoadInstance, String memberClass, String memberCode,
                                        String subsystemCode) {
         return new StringBuilder()
-                .append(xRoadInstance).append("/")
-                .append(memberClass).append("/")
-                .append(memberCode).append("/")
+                .append(xRoadInstance).append('/')
+                .append(memberClass).append('/')
+                .append(memberCode).append('/')
                 .append(subsystemCode).toString();
     }
 

diff --git a/...oad/catalog/lister/configuration/ConfigurationClientSettingsEnvironmentPostProcessor.java b/...oad/catalog/lister/configuration/ConfigurationClientSettingsEnvironmentPostProcessor.java
@@ -63,7 +63,7 @@ private List<String> getKeys(ConfigurableEnvironment environment) {
     }
 
     private void setPropertyAsSystemProperty(ConfigurableEnvironment environment, String key) {
-        System.setProperty(key, environment.getProperty(key).toString());
+        System.setProperty(key, environment.getProperty(key));
     }
 
     private boolean isConfigurationClientEnabled(ConfigurableEnvironment environment) {

diff --git a/...alog-lister/src/test/java/fi/dvv/xroad/catalog/lister/service/JaxbCatalogServiceTest.java b/...alog-lister/src/test/java/fi/dvv/xroad/catalog/lister/service/JaxbCatalogServiceTest.java
@@ -212,7 +212,7 @@ private Member createMember(LocalDateTime updated, int id, boolean removed) {
         Member m = new Member();
         m.setMemberClass("GOV");
         m.setXRoadInstance("FI");
-        m.setMemberCode("" + id);
+        m.setMemberCode(Integer.toString(id));
         m.setId(id);
         m.setName("membername-" + id);
         m.getStatusInfo().setChanged(updated);
@@ -238,7 +238,7 @@ private Subsystem createSubsystem(LocalDateTime updated, int id, boolean removed
         subsystem.getStatusInfo().setCreated(updated);
         subsystem.getStatusInfo().setFetched(updated);
         subsystem.getStatusInfo().setRemoved(removed ? updated : null);
-        subsystem.setSubsystemCode("" + subsystem.getId());
+        subsystem.setSubsystemCode(Long.toString(subsystem.getId()));
 
         Service s1 = createService(updated, false, subsystem, 1);
         Service s2 = createService(updated, false, subsystem, 2);
@@ -255,7 +255,7 @@ private Service createService(LocalDateTime updated, boolean removed, Subsystem
         Service s1 = new Service();
         s1.setId((subsystem.getId() * 10) + id);
         s1.setServiceVersion("v1");
-        s1.setServiceCode("" + s1.getId());
+        s1.setServiceCode(Long.toString(s1.getId()));
         s1.getStatusInfo().setChanged(updated);
         s1.getStatusInfo().setCreated(updated);
         s1.getStatusInfo().setFetched(updated);