COLDBOX-1356 #resolve

Removeal of Router.with() and endWith() in favor of the group() closures.

Author: lmajano

system/web/routing/Router.cfc

@@ -441,66 +441,6 @@ component
 	/* 											ROUTE REGISTRATION METHODS														*/
 	/****************************************************************************************************************************/
 
-	/**
-	 *
-	 * Starts a with closure, where all arguments will be prefixed for the next concatenated addRoute() methods until an endWith() is called
-	 *
-	 * @deprecated            This has been deprecated in favor of the <code>group()</code> function.
-	 * @pattern               The pattern to match against the URL.
-	 * @handler               The handler to execute if pattern matched.
-	 * @action                The action in a handler to execute if a pattern is matched.  This can also be a structure based on the HTTP method(GET,POST,PUT,DELETE). ex: {GET:'show', PUT:'update', DELETE:'delete', POST:'save'}
-	 * @packageResolverExempt If this is set to true, then the interceptor will not try to do handler package resolving. Else a package will always be resolved. Only works if :handler is in a pattern
-	 * @matchVariables        A string of name-value pair variables to add to the request collection when this pattern matches. This is a comma delimited list. Ex: spaceFound=true,missingAction=onTest
-	 * @view                  The view to dispatch if pattern matches.  No event will be fired, so handler,action will be ignored.
-	 * @viewNoLayout          If view is chosen, then you can choose to override and not display a layout with the view. Else the view renders in the assigned layout.
-	 * @valuePairTranslation  Activate convention name value pair translations or not. Turned on by default
-	 * @constraints           A structure of regex constraint overrides for variable placeholders. The key is the name of the variable, the value is the regex to try to match.
-	 * @module                The module to add this route to
-	 * @moduleRouting         Called internally by addModuleRoutes to add a module routing route.
-	 * @namespace             The namespace to add this route to
-	 * @namespaceRouting      Called internally by addNamespaceRoutes to add a namespaced routing route.
-	 * @ssl                   Makes the route an SSL only route if true, else it can be anything. If an ssl only route is hit without ssl, the interceptor will redirect to it via ssl
-	 * @append                Whether the route should be appended or pre-pended to the array. By default we append to the end of the array
-	 * @domain                The domain to match, including wildcards
-	 *
-	 * @return Router
-	 */
-	function with(
-		string pattern,
-		string handler,
-		any action,
-		boolean packageResolverExempt,
-		string matchVariables,
-		string view,
-		boolean viewNoLayout,
-		boolean valuePairTranslation,
-		any constraints,
-		string module,
-		string moduleRouting,
-		string namespace,
-		string namespaceRouting,
-		boolean ssl,
-		boolean append,
-		string domain
-	){
-		// set the withClosure
-		variables.withClosure.append( arguments );
-		return this;
-	}
-
-	/**
-	 *
-	 * End a with closure and returns itself
-	 *
-	 * @deprecated This has been deprecated in favor of the <code>group()</code> function.
-	 *
-	 * @return Router
-	 */
-	function endWith(){
-		variables.withClosure = {};
-		return this;
-	}
-
 	/**
 	 * process a with closure
 	 *
@@ -535,7 +475,6 @@ component
 	}
 
 	/**
-	 * This is the new approach to the <code>with</code> closure approach which has been marked as deprecated.
 	 * You can pass any route option via the <code>options</code> structure and those values will be prefixed against
 	 * any routing values done within the <code>body</code> closure.
 	 *
@@ -771,7 +710,6 @@ component
 	 * @handler               The handler to execute if pattern matched.
 	 * @action                The action in a handler to execute if a pattern is matched.  This can also be a structure based on the HTTP method(GET,POST,PUT,DELETE). ex: {GET:'show', PUT:'update', DELETE:'delete', POST:'save'}
 	 * @packageResolverExempt If this is set to true, then the interceptor will not try to do handler package resolving. Else a package will always be resolved. Only works if :handler is in a pattern
-	 * @matchVariables        DEPRECATED: Use RC or PRC structs instead. A string of name-value pair variables to add to the request collection when this pattern matches. This is a comma delimited list. Ex: spaceFound=true,missingAction=onTest
 	 * @view                  The view to dispatch if pattern matches.  No event will be fired, so handler,action will be ignored.
 	 * @viewNoLayout          If view is chosen, then you can choose to override and not display a layout with the view. Else the view renders in the assigned layout.
 	 * @valuePairTranslation  Activate convention name value pair translations or not. Turned on by default
@@ -805,7 +743,6 @@ component
 		string handler                = "",
 		any action                    = "",
 		boolean packageResolverExempt = "false",
-		string matchVariables         = "",
 		string view                   = "",
 		boolean viewNoLayout          = "false",
 		boolean valuePairTranslation  = "true",

system/web/services/RoutingService.cfc

@@ -590,16 +590,6 @@ component extends="coldbox.system.web.services.BaseService" accessors="true" {
 			findConventionNameValuePairs( requestString, match, results.params );
 		}
 
-		// Process legacy match-variables to incorporate to discovered params
-		results.route.matchVariables
-			.listToArray()
-			.each( function( item ){
-				// Only set if not incoming.
-				if ( !results.params.keyExists( item.getToken( 1, "=" ) ) ) {
-					results.params[ item.getToken( 1, "=" ) ] = item.getToken( 2, "=" );
-				}
-			} );
-
 		return results;
 	}