Skip to content

Commit bafd43e

Browse files
lmajanogithub-actions[bot]
authored andcommitted
Apply cfformat changes
1 parent dc6c278 commit bafd43e

File tree

8 files changed

+18
-36
lines changed

8 files changed

+18
-36
lines changed

system/RestHandler.cfc

+2-6
Original file line numberDiff line numberDiff line change
@@ -426,9 +426,7 @@ component extends="EventHandler" {
426426
*/
427427
if ( arguments.abort ) {
428428
event.setHTTPHeader( name = "Content-Type", value = "application/json" );
429-
event.setHTTPHeader(
430-
statusCode = "#arguments.event.STATUS.NOT_AUTHENTICATED#"
431-
);
429+
event.setHTTPHeader( statusCode = "#arguments.event.STATUS.NOT_AUTHENTICATED#" );
432430

433431
writeOutput( toJson( prc.response.getDataPacket( reset = this.resetDataOnError ) ) );
434432

@@ -480,9 +478,7 @@ component extends="EventHandler" {
480478
*/
481479
if ( arguments.abort ) {
482480
event.setHTTPHeader( name = "Content-Type", value = "application/json" );
483-
event.setHTTPHeader(
484-
statusCode = "#arguments.event.STATUS.NOT_AUTHORIZED#"
485-
);
481+
event.setHTTPHeader( statusCode = "#arguments.event.STATUS.NOT_AUTHORIZED#" );
486482

487483
writeOutput( serializeJSON( prc.response.getDataPacket( reset = this.resetDataOnError ) ) );
488484

system/web/Controller.cfc

+2-6
Original file line numberDiff line numberDiff line change
@@ -847,9 +847,7 @@ component serializable="false" accessors="true" {
847847
oRequestContext.getHTTPMethod()
848848
)
849849
) {
850-
oRequestContext.setHTTPHeader(
851-
statusCode = 405
852-
);
850+
oRequestContext.setHTTPHeader( statusCode = 405 );
853851
// set Invalid HTTP method in context
854852
oRequestContext.setIsInvalidHTTPMethod();
855853
// Do we have a local handler for this exception, if so, call it
@@ -897,9 +895,7 @@ component serializable="false" accessors="true" {
897895
}
898896

899897
// Throw Exception, no handlers defined
900-
oRequestContext.setHTTPHeader(
901-
statusCode = 405
902-
);
898+
oRequestContext.setHTTPHeader( statusCode = 405 );
903899
throw(
904900
message = "Invalid HTTP Method: '#oRequestContext.getHTTPMethod()#'",
905901
detail = "The requested URL: #oRequestContext.getCurrentRoutedURL()# cannot be executed using the incoming HTTP request method '#oRequestContext.getHTTPMethod()#'",

system/web/context/RequestContext.cfc

+1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ component serializable="false" accessors="true" {
101101

102102
/**
103103
* The last status text
104+
*
104105
* @REMOVED by Jakarta EE, remove by 8
105106
*/
106107
property

system/web/context/Response.cfc

+1-4
Original file line numberDiff line numberDiff line change
@@ -317,10 +317,7 @@ component accessors="true" {
317317
*
318318
* @return Returns the Response object for chaining
319319
*/
320-
Response function setErrorMessage(
321-
required errorMessage,
322-
statusCode
323-
){
320+
Response function setErrorMessage( required errorMessage, statusCode ){
324321
setError( true );
325322
addMessage( arguments.errorMessage );
326323

system/web/routing/Router.cfc

+3-6
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ component
2222
****************************************************************/
2323

2424
property
25-
name ="cachebox"
25+
name ="cachebox"
2626
inject ="cachebox"
2727
delegate="getCache";
2828
property
2929
name ="controller"
30-
inject ="coldbox"
30+
inject ="coldbox"
3131
delegate="relocate,runEvent,runRoute";
3232
property name="flash" inject="coldbox:flash";
3333
property name="logBox" inject="logbox";
@@ -1967,10 +1967,7 @@ component
19671967
*
19681968
* @throws InvalidArgumentException
19691969
*/
1970-
function toResponse(
1971-
required body,
1972-
numeric statusCode = 200
1973-
){
1970+
function toResponse( required body, numeric statusCode = 200 ){
19741971
// Arg Check
19751972
if ( !isClosure( arguments.body ) && !isCustomFunction( arguments.body ) && !isSimpleValue( arguments.body ) ) {
19761973
throw(

system/web/services/RoutingService.cfc

+1-3
Original file line numberDiff line numberDiff line change
@@ -692,9 +692,7 @@ component extends="coldbox.system.web.services.BaseService" accessors="true" {
692692
// remove it from the string and return string for continued parsing.
693693
return left( requestString, len( arguments.requestString ) - extensionLen - 1 );
694694
} else if ( variables.router.getThrowOnInvalidExtension() ) {
695-
event.setHTTPHeader(
696-
statusCode = 406
697-
);
695+
event.setHTTPHeader( statusCode = 406 );
698696
throw(
699697
message = "Invalid requested format extendion: #extension#",
700698
detail = "Invalid Request Format Extension Detected: #extension#. Valid extensions are: #variables.router.getValidExtensions()#",

tests/specs/RestHandlerTest.cfc

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ component extends="coldbox.system.testing.BaseModelTest" {
2121
flashScope = createEmptyMock( "coldbox.system.web.flash.MockFlash" );
2222
mockRequestContext = createMock( "coldbox.system.web.context.RequestContext" ).init(
2323
{
24-
eventName : "event",
25-
modules : {},
26-
defaultLayout: "",
27-
defaultView : ""
24+
eventName : "event",
25+
modules : {},
26+
defaultLayout : "",
27+
defaultView : ""
2828
},
2929
mockController
3030
);
@@ -205,9 +205,9 @@ component extends="coldbox.system.testing.BaseModelTest" {
205205
mockRequestContext.getPrivateCollection(),
206206
"badAction",
207207
{
208-
message : "Invalid syntax",
209-
detail : "oooops!",
210-
stackTrace: callStackGet().toString()
208+
message : "Invalid syntax",
209+
detail : "oooops!",
210+
stackTrace : callStackGet().toString()
211211
},
212212
{}
213213
);

tests/specs/web/context/RequestContextTest.cfc

+1-4
Original file line numberDiff line numberDiff line change
@@ -546,10 +546,7 @@ component extends="coldbox.system.testing.BaseModelTest" {
546546
assertEquals( rd.contenttype, "application/ms-excel" );
547547

548548
// Test StatusCodes
549-
event.renderData(
550-
data = "hello",
551-
statusCode = "400"
552-
);
549+
event.renderData( data = "hello", statusCode = "400" );
553550
rd = event.getRenderData();
554551
assertEquals( rd.statusCode, "400" );
555552
}

0 commit comments

Comments
 (0)