Removed external dependencies from the fflib extensions

OrtooApps · May 4, 2022 · 1a7964e · 1a7964e
1 parent 1b3ba7b
commit 1a7964e
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 41 deletions.
diff --git a/sfdx-source/apex-common/main/classes/fflib_Application.cls b/sfdx-source/apex-common/main/classes/fflib_Application.cls
@@ -192,11 +192,7 @@ public virtual class fflib_Application
 			}
 
 			try {
-				if ( !serviceInterfaceName.endsWith( 'ILoggerService' ) )
-				{
-					LoggerService.log( LoggerService.LEVEL.INFO, 'Using default implementation ' + defaultServiceName + ' for ' + serviceInterfaceName );
-				}
-
+				System.debug( LoggingLevel.INFO, 'Using default implementation ' + defaultServiceName + ' for ' + serviceInterfaceName );
 				return defaultServiceType.newInstance();
 			}
 			catch ( Exception e ) {

diff --git a/sfdx-source/apex-common/main/classes/fflib_QueryFactory.cls b/sfdx-source/apex-common/main/classes/fflib_QueryFactory.cls
@@ -77,7 +77,7 @@ public class fflib_QueryFactory { //No explicit sharing declaration - inherit fr
 		}
 		set;
 	}
-	private ISearchCriteria conditionCriteria;
+	private fflib_ISoqlable conditionCriteria;
 	private Integer limitCount;
 	private Integer offsetCount;
 	private List<Ordering> order;
@@ -347,7 +347,7 @@ public class fflib_QueryFactory { //No explicit sharing declaration - inherit fr
 	/**
 	 * @param conditionExpression Sets the WHERE clause to the string provided by the given ISearchCriteria
 	**/
-	public fflib_QueryFactory setCondition(ISearchCriteria criteria){
+	public fflib_QueryFactory setCondition(fflib_ISoqlable criteria){
 		this.conditionCriteria = criteria;
 		this.conditionExpression = null;
 		return this;

diff --git a/sfdx-source/apex-common/test/classes/fflib_QueryFactoryTest.cls b/sfdx-source/apex-common/test/classes/fflib_QueryFactoryTest.cls
@@ -72,56 +72,61 @@ private class fflib_QueryFactoryTest {
 	}
 
 	@isTest
-	static void iSearchCriteriaCondition(){
+	static void iSoqlableCondition(){
 
 		String whereClause = 'name = \'test\'';
 
-		Amoss_Instance searchCriteriaController = new Amoss_Instance( ISearchCriteria.class );
-		searchCriteriaController
-			.when( 'toSoql' )
-			.returns( whereClause );
+		fflib_ApexMocks mocks = new fflib_ApexMocks();
+		fflib_ISoqlable mockSoqlable = (fflib_ISoqlable)mocks.mock( fflib_ISoqlable.class );
+
+		mocks.startStubbing();
+		mocks.when( mockSoqlable.toSOQL() ).thenReturn( whereClause );
+		mocks.stopStubbing();
 
 		fflib_QueryFactory qf = new fflib_QueryFactory(Contact.SObjectType);
 		qf.selectField('name');
-		qf.setCondition( (ISearchCriteria)searchCriteriaController.getDouble() );
+		qf.setCondition( mockSoqlable );
 
-		System.assertEquals( whereClause, qf.getCondition(), 'setCondition, when given an ISearchCriteria, will set the condition based on the criteria' );
+		System.assertEquals( whereClause, qf.getCondition(), 'setCondition, when given an fflib_ISoqlable, will set the condition based on the criteria' );
 
 		String query = qf.toSOQL();
 		System.assert( query.endsWith('WHERE name = \'test\''),'Query should have ended with a filter on name, got: '+query);
+
+		((fflib_ISoqlable)mocks.verify( mockSoqlable, mocks.atLeast(1))).toSoql();
 	}
 
 	@isTest
-	static void iSearchCriteriaCondition_notEvaluatedOnSet(){
+	static void iSoqlableCondition_notEvaluatedOnSet(){
 
-		Amoss_Instance searchCriteriaController = new Amoss_Instance( ISearchCriteria.class );
-		searchCriteriaController
-			.expectsNoCalls();
+		fflib_ApexMocks mocks = new fflib_ApexMocks();
+		fflib_ISoqlable mockSoqlable = (fflib_ISoqlable)mocks.mock( fflib_ISoqlable.class );
 
 		fflib_QueryFactory qf = new fflib_QueryFactory(Contact.SObjectType);
 		qf.selectField('name');
-		qf.setCondition( (ISearchCriteria)searchCriteriaController.getDouble() );
+		qf.setCondition( mockSoqlable );
 
-		searchCriteriaController.verify();
+		((fflib_ISoqlable)mocks.verify( mockSoqlable, mocks.never())).toSoql();
 	}
 
 	@isTest
-	static void iSearchCriteriaCondition_isEvaluatedOnGet(){
+	static void iSoqlableCondition_isEvaluatedOnGet(){
 
 		String whereClause = 'name = \'test\'';
 
-		Amoss_Instance searchCriteriaController = new Amoss_Instance( ISearchCriteria.class );
-		searchCriteriaController
-			.when( 'toSoql' )
-			.returns( whereClause );
+		fflib_ApexMocks mocks = new fflib_ApexMocks();
+		fflib_ISoqlable mockSoqlable = (fflib_ISoqlable)mocks.mock( fflib_ISoqlable.class );
+
+		mocks.startStubbing();
+		mocks.when( mockSoqlable.toSOQL() ).thenReturn( whereClause );
+		mocks.stopStubbing();
 
 		fflib_QueryFactory qf = new fflib_QueryFactory(Contact.SObjectType);
 		qf.selectField('name');
-		qf.setCondition( (ISearchCriteria)searchCriteriaController.getDouble() );
+		qf.setCondition( mockSoqlable );
 
 		qf.getCondition();
 
-		searchCriteriaController.verify();
+		((fflib_ISoqlable)mocks.verify( mockSoqlable, mocks.times(1))).toSoql();
 	}
 
 	@isTest
@@ -130,17 +135,19 @@ private class fflib_QueryFactoryTest {
 		String stringWhereClause = 'name = \'string\'';
 		String criteriaWhereClause = 'name = \'criteria\'';
 
-		Amoss_Instance searchCriteriaController = new Amoss_Instance( ISearchCriteria.class );
-		searchCriteriaController
-			.when( 'toSoql' )
-			.returns( criteriaWhereClause );
+		fflib_ApexMocks mocks = new fflib_ApexMocks();
+		fflib_ISoqlable mockSoqlable = (fflib_ISoqlable)mocks.mock( fflib_ISoqlable.class );
+
+		mocks.startStubbing();
+		mocks.when( mockSoqlable.toSOQL() ).thenReturn( criteriaWhereClause );
+		mocks.stopStubbing();
 
 		fflib_QueryFactory qf = new fflib_QueryFactory(Contact.SObjectType);
 		qf.selectField('name');
 		qf.setCondition( stringWhereClause );
-		qf.setCondition( (ISearchCriteria)searchCriteriaController.getDouble() );
+		qf.setCondition( mockSoqlable );
 
-		System.assertEquals( criteriaWhereClause, qf.getCondition(), 'setCondition, when given a string then a ISearchCriteria, will set the condition based on the last thing - the criteria' );
+		System.assertEquals( criteriaWhereClause, qf.getCondition(), 'setCondition, when given a string then a fflib_ISoqlable, will set the condition based on the last thing - the criteria' );
 	}
 
 	@isTest
@@ -149,17 +156,19 @@ private class fflib_QueryFactoryTest {
 		String stringWhereClause = 'name = \'string\'';
 		String criteriaWhereClause = 'name = \'criteria\'';
 
-		Amoss_Instance searchCriteriaController = new Amoss_Instance( ISearchCriteria.class );
-		searchCriteriaController
-			.when( 'toSoql' )
-			.returns( criteriaWhereClause );
+		fflib_ApexMocks mocks = new fflib_ApexMocks();
+		fflib_ISoqlable mockSoqlable = (fflib_ISoqlable)mocks.mock( fflib_ISoqlable.class );
+
+		mocks.startStubbing();
+		mocks.when( mockSoqlable.toSOQL() ).thenReturn( criteriaWhereClause );
+		mocks.stopStubbing();
 
 		fflib_QueryFactory qf = new fflib_QueryFactory(Contact.SObjectType);
 		qf.selectField('name');
-		qf.setCondition( (ISearchCriteria)searchCriteriaController.getDouble() );
+		qf.setCondition( mockSoqlable );
 		qf.setCondition( stringWhereClause );
 
-		System.assertEquals( stringWhereClause, qf.getCondition(), 'setCondition, when given a ISearchCriteria then string, will set the condition based on the last thing - the string' );
+		System.assertEquals( stringWhereClause, qf.getCondition(), 'setCondition, when given a fflib_ISoqlable then string, will set the condition based on the last thing - the string' );
 	}
 
 	@isTest

diff --git a/sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_Criteria.cls b/sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_Criteria.cls
@@ -864,10 +864,9 @@ public virtual with sharing class fflib_Criteria
 		return result + ')';
 	}
 
-	public interface Evaluator
+	public interface Evaluator extends fflib_ISoqlable
 	{
 		Boolean evaluate(Object obj);
-		String toSOQL();
 	}
 
 	/**

diff --git a/sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_ISoqlable.cls b/sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_ISoqlable.cls
@@ -0,0 +1,4 @@
+public interface fflib_ISoqlable
+{
+	String toSOQL();
+}
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_ISoqlable.cls-meta.xml b/sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_ISoqlable.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>53.0</apiVersion>
+    <status>Active</status>
+</ApexClass>