chore(BaseGrammar): Inline null services

coldbox-modules · Feb 28, 2020 · 4ccad99 · 4ccad99
1 parent d98a5cb
commit 4ccad99
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 23 deletions.
diff --git a/models/Grammars/BaseGrammar.cfc b/models/Grammars/BaseGrammar.cfc
@@ -57,8 +57,8 @@ component displayname="Grammar" accessors="true" singleton {
         variables.utils = arguments.utils;
         variables.tablePrefix = "";
         // These are overwritten by WireBox, if it exists.
-        variables.interceptorService = new qb.models.compat.NullInterceptorService();
-        variables.log = new qb.models.compat.NullLogger();
+        variables.interceptorService = { "processState": function() {} };
+        variables.log = { "debug": function() {} };
         return this;
     }
 
@@ -87,7 +87,7 @@ component displayname="Grammar" accessors="true" singleton {
         };
         tryPreInterceptor( data );
         structAppend( data.options, { result: "local.result" }, true );
-        log.debug( "Executing sql: #data.sql#", "With bindings: #serializeJSON( data.bindings )#" );
+        variables.log.debug( "Executing sql: #data.sql#", "With bindings: #serializeJSON( data.bindings )#" );
         var q = queryExecute( data.sql, data.bindings, data.options );
         data.query = isNull( q ) ? javacast( "null", "" ) : q;
         data.result = local.result;
@@ -102,11 +102,6 @@ component displayname="Grammar" accessors="true" singleton {
      * This method exists because the API for InterceptorService differs between ColdBox and CommandBox
      */
     private function tryPreInterceptor( data ) {
-        if ( structKeyExists( application, "applicationName" ) && application.applicationName == "CommandBox CLI" ) {
-            variables.interceptorService.announceInterception( "preQBExecute", data );
-            return;
-        }
-
         variables.interceptorService.processState( "preQBExecute", data );
         return;
     }

diff --git a/models/compat/NullInterceptorService.cfc b/models/compat/NullInterceptorService.cfc
diff --git a/models/compat/NullLogger.cfc b/models/compat/NullLogger.cfc
diff --git a/tests/runner.cfm b/tests/runner.cfm
@@ -13,7 +13,7 @@
 <cfparam name="url.coverageEnabled"					default="true">
 <cfparam name="url.coveragePathToCapture"			default="#expandPath( '/qb' )#">
 <cfparam name="url.coverageWhitelist"				default="">
-<cfparam name="url.coverageBlacklist"				default="/testbox,/tests,/docs">
+<cfparam name="url.coverageBlacklist"				default="/testbox,/tests,/docs,/modules">
 <cfparam name="url.coverageBrowserOutputDir"		default="#expandPath( '/tests/results/coverageReport' )#">
 
 <!--- Include the TestBox HTML Runner --->