Code Refactoring

pgajek2 · pgajek2 · commit f2757fa42b54 · 2025-08-15T10:26:39.000+02:00
Signed-off-by: Piotr PG Gajek &lt;piotr.gajek95@gmail.com&gt;
diff --git a/force-app/main/default/classes/Consts.cls b/force-app/main/default/classes/Consts.cls
@@ -1,5 +1,5 @@
+@SuppressWarnings('PMD.PropertyNamingConventions')
 public class Consts {
-
     public static final AccountConsts ACCOUNT {
         get {
             return AccountConsts.INSTANCE;
diff --git a/force-app/main/default/classes/Consts.cls-meta.xml b/force-app/main/default/classes/Consts.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>55.0</apiVersion>
+    <apiVersion>64.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/force-app/main/default/classes/ConstsTest.cls b/force-app/main/default/classes/ConstsTest.cls
@@ -1,23 +1,22 @@
 @IsTest
-public class ConstsTest {
-
+private class ConstsTest {
     @IsTest
     static void accountConsts() {
-        Assert.areNotEqual(null, Consts.ACCOUNT);
+        Assert.isNotNull(Consts.ACCOUNT, 'Account constants should not be null');
     }
 
     @IsTest
     static void contactConsts() {
-        Assert.areNotEqual(null, Consts.CONTACT);
+        Assert.isNotNull(Consts.CONTACT, 'Contact constants should not be null');
     }
 
     @IsTest
     static void opportunityConsts() {
-        Assert.areNotEqual(null, Consts.OPPORTUNITY);
+        Assert.isNotNull(Consts.OPPORTUNITY, 'Opportunity constants should not be null');
     }
 
     @IsTest
     static void profileConsts() {
-        Assert.areNotEqual(null, Consts.PROFILE);
+        Assert.isNotNull(Consts.PROFILE, 'Profile constants should not be null');
     }
 }
diff --git a/force-app/main/default/classes/ConstsTest.cls-meta.xml b/force-app/main/default/classes/ConstsTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>55.0</apiVersion>
+    <apiVersion>64.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/force-app/main/default/classes/concrete-consts/AccountConsts.cls b/force-app/main/default/classes/concrete-consts/AccountConsts.cls
@@ -1,3 +1,4 @@
+@SuppressWarnings('PMD.FieldNamingConventions, PMD.EmptyStatementBlock')
 public class AccountConsts {
     public static final AccountConsts INSTANCE = new AccountConsts();
 
@@ -21,4 +22,6 @@ public class AccountConsts {
         public final String HOT = 'Hot';
         public final String WARM = 'Warm';
     }
+
+    private AccountConsts() {}
 }
diff --git a/force-app/main/default/classes/concrete-consts/AccountConsts.cls-meta.xml b/force-app/main/default/classes/concrete-consts/AccountConsts.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>55.0</apiVersion>
+    <apiVersion>64.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/force-app/main/default/classes/concrete-consts/ContactConsts.cls b/force-app/main/default/classes/concrete-consts/ContactConsts.cls
@@ -1,3 +1,4 @@
+@SuppressWarnings('PMD.FieldNamingConventions, PMD.EmptyStatementBlock')
 public class ContactConsts {
     public static final ContactConsts INSTANCE = new ContactConsts();
 
@@ -10,4 +11,6 @@ public class ContactConsts {
         public final String ACTIVATED = 'Activated';
         public final String DRAFT = 'Draft';
     }
+
+    private ContactConsts() {}
 }
diff --git a/force-app/main/default/classes/concrete-consts/ContactConsts.cls-meta.xml b/force-app/main/default/classes/concrete-consts/ContactConsts.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>55.0</apiVersion>
+    <apiVersion>64.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/force-app/main/default/classes/concrete-consts/OpportunityConsts.cls b/force-app/main/default/classes/concrete-consts/OpportunityConsts.cls
@@ -1,3 +1,4 @@
+@SuppressWarnings('PMD.FieldNamingConventions, PMD.EmptyStatementBlock')
 public class OpportunityConsts {
     public static final OpportunityConsts INSTANCE = new OpportunityConsts();
 
@@ -12,4 +13,6 @@ public class OpportunityConsts {
         public final String EXISTING_CUSTOMER_UPGRADE = 'Existing Customer - Upgrade';
         public final String NEW_CUSTOMER = 'New Customer';
     }
+
+    private OpportunityConsts() {}
 }
diff --git a/force-app/main/default/classes/concrete-consts/OpportunityConsts.cls-meta.xml b/force-app/main/default/classes/concrete-consts/OpportunityConsts.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>55.0</apiVersion>
+    <apiVersion>64.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/force-app/main/default/classes/concrete-consts/ProfileConsts.cls b/force-app/main/default/classes/concrete-consts/ProfileConsts.cls
@@ -1,3 +1,4 @@
+@SuppressWarnings('PMD.FieldNamingConventions, PMD.EmptyStatementBlock, PMD.ExcessivePublicCount, PMD.TooManyFields')
 public class ProfileConsts {
     public static final ProfileConsts INSTANCE = new ProfileConsts();
 
@@ -41,4 +42,6 @@ public class ProfileConsts {
         public final String SYSTEM_ADMINSTRATOR = 'System Administrator';
         public final String WORK_COM_ONLY_USER = 'Work.com Only User';
     }
+
+    private ProfileConsts() {}
 }
diff --git a/force-app/main/default/classes/concrete-consts/ProfileConsts.cls-meta.xml b/force-app/main/default/classes/concrete-consts/ProfileConsts.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>55.0</apiVersion>
+    <apiVersion>64.0</apiVersion>
     <status>Active</status>
 </ApexClass>

Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,22 @@`
`1`	`1`	`@IsTest`
`2`		`-public class ConstsTest {`
`3`		`-`
	`2`	`+private class ConstsTest {`
`4`	`3`	`@IsTest`
`5`	`4`	`static void accountConsts() {`
`6`		`- Assert.areNotEqual(null, Consts.ACCOUNT);`
	`5`	`+ Assert.isNotNull(Consts.ACCOUNT, 'Account constants should not be null');`
`7`	`6`	`}`
`8`	`7`
`9`	`8`	`@IsTest`
`10`	`9`	`static void contactConsts() {`
`11`		`- Assert.areNotEqual(null, Consts.CONTACT);`
	`10`	`+ Assert.isNotNull(Consts.CONTACT, 'Contact constants should not be null');`
`12`	`11`	`}`
`13`	`12`
`14`	`13`	`@IsTest`
`15`	`14`	`static void opportunityConsts() {`
`16`		`- Assert.areNotEqual(null, Consts.OPPORTUNITY);`
	`15`	`+ Assert.isNotNull(Consts.OPPORTUNITY, 'Opportunity constants should not be null');`
`17`	`16`	`}`
`18`	`17`
`19`	`18`	`@IsTest`
`20`	`19`	`static void profileConsts() {`
`21`		`- Assert.areNotEqual(null, Consts.PROFILE);`
	`20`	`+ Assert.isNotNull(Consts.PROFILE, 'Profile constants should not be null');`
`22`	`21`	`}`
`23`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+@SuppressWarnings('PMD.FieldNamingConventions, PMD.EmptyStatementBlock')`
`1`	`2`	`public class AccountConsts {`
`2`	`3`	`public static final AccountConsts INSTANCE = new AccountConsts();`
`3`	`4`
`@@ -21,4 +22,6 @@ public class AccountConsts {`
`21`	`22`	`public final String HOT = 'Hot';`
`22`	`23`	`public final String WARM = 'Warm';`
`23`	`24`	`}`
	`25`	`+`
	`26`	`+ private AccountConsts() {}`
`24`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+@SuppressWarnings('PMD.FieldNamingConventions, PMD.EmptyStatementBlock')`
`1`	`2`	`public class ContactConsts {`
`2`	`3`	`public static final ContactConsts INSTANCE = new ContactConsts();`
`3`	`4`
`@@ -10,4 +11,6 @@ public class ContactConsts {`
`10`	`11`	`public final String ACTIVATED = 'Activated';`
`11`	`12`	`public final String DRAFT = 'Draft';`
`12`	`13`	`}`
	`14`	`+`
	`15`	`+ private ContactConsts() {}`
`13`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+@SuppressWarnings('PMD.FieldNamingConventions, PMD.EmptyStatementBlock')`
`1`	`2`	`public class OpportunityConsts {`
`2`	`3`	`public static final OpportunityConsts INSTANCE = new OpportunityConsts();`
`3`	`4`
`@@ -12,4 +13,6 @@ public class OpportunityConsts {`
`12`	`13`	`public final String EXISTING_CUSTOMER_UPGRADE = 'Existing Customer - Upgrade';`
`13`	`14`	`public final String NEW_CUSTOMER = 'New Customer';`
`14`	`15`	`}`
	`16`	`+`
	`17`	`+ private OpportunityConsts() {}`
`15`	`18`	`}`