diff --git a/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicSelectorFactory.cls b/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicSelectorFactory.cls index 6b2ed96..0f6cd20 100644 --- a/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicSelectorFactory.cls +++ b/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicSelectorFactory.cls @@ -59,7 +59,8 @@ public virtual class fflib_ClassicSelectorFactory * @param sObjectType The SObjectType of the Ids * * @return The queried records - * @exception fflib_Application.DeveloperException is thrown if the Ids set is empty + * + * @throws fflib_Application.DeveloperException is thrown if the Ids set is empty */ public virtual List selectById(Set recordIds, SObjectType sObjectType) { diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBinding.cls b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBinding.cls index e88ae6c..dddbcf6 100644 --- a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBinding.cls +++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBinding.cls @@ -38,7 +38,6 @@ public virtual class fflib_AppBinding protected System.Type interfaceType { get; set; } protected String namespacePrefix { get; set; } protected String packageName { get; set; } - protected fflib_SharingMode sharingMode { get; set; } public Integer compareTo(Object compareTo) { @@ -106,16 +105,6 @@ public virtual class fflib_AppBinding return this.bindingSequence; } - /** - * @return Returns an enum value fflib_SharingMode that defines the type of sharing used in the implementation class - * - * @see fflib_SharingMode - */ - public virtual fflib_SharingMode getSharingMode() - { - return this.sharingMode; - } - /** * Creates a new instance of the implementation for this binding. * @@ -224,19 +213,4 @@ public virtual class fflib_AppBinding this.bindingSequence = sequence; return this; } - - /** - * Sets an enum value fflib_SharingMode that defines the type of sharing used in the implementation class - * - * @param sharingMode A enum value of fflib_SharingMode representing the sharing mode - * - * @return An instance of itself to enable method chaining - * - * @see fflib_SharingMode - */ - public virtual fflib_IAppBinding setSharingMode(fflib_SharingMode sharingMode) - { - this.sharingMode = sharingMode; - return this; - } } \ No newline at end of file diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingMetaDataModule.cls b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingMetaDataModule.cls index ddb522e..601accb 100644 --- a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingMetaDataModule.cls +++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingMetaDataModule.cls @@ -45,7 +45,6 @@ public with sharing class fflib_AppBindingMetaDataModule .setNamespacePrefix(binding.NamespacePrefix) .setPackageName(binding.ApplicationPackage__r.DeveloperName) .setSequence(binding.BindingSequence__c) - .setSharingMode(getSharingModeFromString(binding.SharingMode__c)) ); } } @@ -94,30 +93,6 @@ public with sharing class fflib_AppBindingMetaDataModule return bindingTypeByStrings.get(binding.Type__c.toUpperCase()); } - private fflib_SharingMode getSharingModeFromString(String sharingMode) - { - switch on sharingMode.toUpperCase() - { - when 'WITH SHARING' - { - return fflib_SharingMode.WithSharing; - } - when 'WITHOUT SHARING' - { - return fflib_SharingMode.WithoutSharing; - } - when 'INHERITED SHARING' - { - return fflib_SharingMode.WithoutSharing; - } - when 'NONE' - { - return null; - } - } - return null; - } - private Type getSystemType(fflib_AppBinding__mdt binding, Schema.SObjectField sObjectField) { String systemTypeName = String.valueOf(binding.get(sObjectField)); diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingResolver.cls b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingResolver.cls index 406617b..875c376 100644 --- a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingResolver.cls +++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingResolver.cls @@ -120,12 +120,6 @@ public virtual class fflib_AppBindingResolver return this; } - public fflib_IAppBindingResolver bySharingMode(fflib_SharingMode sharingMode) - { - this.bindingToResolve.setSharingMode(sharingMode); - return this; - } - public fflib_IAppBindingResolver byNamespacePrefix(String namespacePrefix) { this.bindingToResolve.setNamespacePrefix(namespacePrefix); diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingsSelector.cls b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingsSelector.cls index 05d268d..60d9ba5 100644 --- a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingsSelector.cls +++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingsSelector.cls @@ -46,7 +46,6 @@ public virtual without sharing class fflib_AppBindingsSelector extends fflib_SOb fflib_AppBinding__mdt.NamespacePrefix, fflib_AppBinding__mdt.ImplementationType__c, fflib_AppBinding__mdt.InterfaceType__c, - fflib_AppBinding__mdt.SharingMode__c, fflib_AppBinding__mdt.Type__c }; } diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicSelectorFactory.cls b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicSelectorFactory.cls index 65eec43..9719207 100644 --- a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicSelectorFactory.cls +++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicSelectorFactory.cls @@ -94,12 +94,6 @@ public virtual class fflib_DynamicSelectorFactory this.selectorFactory.setMock(sObjectType, selectorInstance); } - public fflib_DynamicSelectorFactory setSharingMode(fflib_SharingMode sharingMode) - { - this.sharingMode = sharingMode; - return this; - } - private void loadBindings() { fflib_IAppBindings appBindings = new fflib_AppBindings(resolver.resolve()); diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicServiceFactory.cls b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicServiceFactory.cls index a0808a8..017c73a 100644 --- a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicServiceFactory.cls +++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicServiceFactory.cls @@ -66,12 +66,6 @@ public virtual class fflib_DynamicServiceFactory this.serviceFactory.setMock(serviceInterfaceType, serviceImpl); } - public fflib_DynamicServiceFactory setSharingMode(fflib_SharingMode sharingMode) - { - this.sharingMode = sharingMode; - return this; - } - private void loadBindings() { fflib_IAppBindings appBindings = new fflib_AppBindings(resolver.resolve()); diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBinding.cls b/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBinding.cls index 29d6c26..826641c 100644 --- a/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBinding.cls +++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBinding.cls @@ -66,13 +66,6 @@ public interface fflib_IAppBinding */ Decimal getSequence(); - /** - * @return Returns an enum value fflib_SharingMode that defines the type of sharing used in the implementation class - * - * @see fflib_SharingMode - */ - fflib_SharingMode getSharingMode(); - /** * Creates a new instance of the implementation for this binding. * @@ -148,15 +141,4 @@ public interface fflib_IAppBinding * @return An instance of itself to enable method chaining */ fflib_IAppBinding setSequence(Decimal sequence); - - /** - * Sets an enum value fflib_SharingMode that defines the type of sharing used in the implementation class - * - * @param sharingMode A enum value of fflib_SharingMode representing the sharing mode - * - * @return An instance of itself to enable method chaining - * - * @see fflib_SharingMode - */ - fflib_IAppBinding setSharingMode(fflib_SharingMode sharingMode); } \ No newline at end of file diff --git a/sfdx-source/apex-extensions/main/application/dynamic/layouts/fflib_AppBinding__mdt-Binding Layout.layout-meta.xml b/sfdx-source/apex-extensions/main/application/dynamic/layouts/fflib_AppBinding__mdt-Binding Layout.layout-meta.xml index e20ce5c..717f47f 100644 --- a/sfdx-source/apex-extensions/main/application/dynamic/layouts/fflib_AppBinding__mdt-Binding Layout.layout-meta.xml +++ b/sfdx-source/apex-extensions/main/application/dynamic/layouts/fflib_AppBinding__mdt-Binding Layout.layout-meta.xml @@ -63,10 +63,6 @@ Required ImplementationType__c - - Required - SharingMode__c - diff --git a/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicDomainFactoryTest.cls b/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicDomainFactoryTest.cls index 9e7de58..1f1e055 100644 --- a/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicDomainFactoryTest.cls +++ b/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicDomainFactoryTest.cls @@ -179,8 +179,7 @@ public class fflib_DynamicDomainFactoryTest Type__c = 'Domain', BindingObject__c = '', BindingObjectAlternate__c = ACCOUNT_OBJECT_TYPE.getDescribe().getName(), - ImplementationType__c = MyDomainConstructor.class.getName(), - SharingMode__c = 'None' + ImplementationType__c = MyDomainConstructor.class.getName() ), new fflib_AppBinding__mdt( ApplicationPackage__c = otherApp.Id, @@ -188,8 +187,7 @@ public class fflib_DynamicDomainFactoryTest Type__c = 'Domain', BindingObject__c = '', BindingObjectAlternate__c = ACCOUNT_OBJECT_TYPE.getDescribe().getName(), - ImplementationType__c = OtherDomainConstructor.class.getName(), - SharingMode__c = 'None' + ImplementationType__c = OtherDomainConstructor.class.getName() ) }; } diff --git a/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicSelectorFactoryTest.cls b/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicSelectorFactoryTest.cls index 4146781..cecf5d3 100644 --- a/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicSelectorFactoryTest.cls +++ b/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicSelectorFactoryTest.cls @@ -37,8 +37,7 @@ public class fflib_DynamicSelectorFactoryTest @TestVisible private static final fflib_DynamicSelectorFactory Selector = - new fflib_DynamicSelectorFactory(bindingResolver) - .setSharingMode(fflib_SharingMode.WithSharing); + new fflib_DynamicSelectorFactory(bindingResolver); private static final Type MY_SELECTOR_TYPE = fflib_DynamicSelectorFactoryTest.MySelector.class; @@ -147,8 +146,7 @@ public class fflib_DynamicSelectorFactoryTest Type__c = 'Selector', BindingObject__c = '', BindingObjectAlternate__c = Schema.Account.SObjectType.getDescribe().getName(), - ImplementationType__c = MY_SELECTOR_TYPE.getName(), - SharingMode__c = 'With Sharing' + ImplementationType__c = MY_SELECTOR_TYPE.getName() ) }; } diff --git a/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicServiceFactoryTest.cls b/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicServiceFactoryTest.cls index 3c50250..8d2b587 100644 --- a/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicServiceFactoryTest.cls +++ b/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicServiceFactoryTest.cls @@ -112,7 +112,6 @@ public class fflib_DynamicServiceFactoryTest result.setBindingType(fflib_AppBindingType.Service); result.setInterfaceType(MY_SERVICE_TYPE); result.setImplementationType(MY_SERVICE_TYPE); - result.setSharingMode(fflib_SharingMode.WithSharing); result.setSequence(2); return result; } @@ -148,14 +147,12 @@ public class fflib_DynamicServiceFactoryTest Type__c = 'Service', InterfaceType__c = MY_SERVICE_INTERFACE_TYPE.getName(), ImplementationType__c = MY_SERVICE_TYPE.getName(), - SharingMode__c = 'With Sharing', BindingSequence__c = 1 ), new fflib_AppBinding__mdt( Type__c = 'Service', InterfaceType__c = MY_SERVICE_INTERFACE_TYPE.getName(), ImplementationType__c = MY_ALT_SERVICE_TYPE.getName(), - SharingMode__c = 'With Sharing', BindingSequence__c = 2 ) }; @@ -172,14 +169,12 @@ public class fflib_DynamicServiceFactoryTest Type__c = 'Service', InterfaceType__c = MY_SERVICE_INTERFACE_TYPE.getName(), ImplementationType__c = MY_SERVICE_TYPE.getName(), - SharingMode__c = 'With Sharing', BindingSequence__c = 2 ), new fflib_AppBinding__mdt( Type__c = 'Service', InterfaceType__c = MY_SERVICE_INTERFACE_TYPE.getName(), ImplementationType__c = MY_ALT_SERVICE_TYPE.getName(), - SharingMode__c = 'With Sharing', BindingSequence__c = 1 ) };