File tree 8 files changed +18
-36
lines changed
8 files changed +18
-36
lines changed Original file line number Diff line number Diff line change @@ -426,9 +426,7 @@ component extends="EventHandler" {
426
426
*/
427
427
if ( arguments .abort ) {
428
428
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 #" );
432
430
433
431
writeOutput ( toJson ( prc .response .getDataPacket ( reset = this .resetDataOnError ) ) );
434
432
@@ -480,9 +478,7 @@ component extends="EventHandler" {
480
478
*/
481
479
if ( arguments .abort ) {
482
480
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 #" );
486
482
487
483
writeOutput ( serializeJSON ( prc .response .getDataPacket ( reset = this .resetDataOnError ) ) );
488
484
Original file line number Diff line number Diff line change @@ -847,9 +847,7 @@ component serializable="false" accessors="true" {
847
847
oRequestContext .getHTTPMethod ()
848
848
)
849
849
) {
850
- oRequestContext .setHTTPHeader (
851
- statusCode = 405
852
- );
850
+ oRequestContext .setHTTPHeader ( statusCode = 405 );
853
851
// set Invalid HTTP method in context
854
852
oRequestContext .setIsInvalidHTTPMethod ();
855
853
// Do we have a local handler for this exception, if so, call it
@@ -897,9 +895,7 @@ component serializable="false" accessors="true" {
897
895
}
898
896
899
897
// Throw Exception, no handlers defined
900
- oRequestContext .setHTTPHeader (
901
- statusCode = 405
902
- );
898
+ oRequestContext .setHTTPHeader ( statusCode = 405 );
903
899
throw (
904
900
message = " Invalid HTTP Method: '#oRequestContext .getHTTPMethod () #'" ,
905
901
detail = " The requested URL: #oRequestContext .getCurrentRoutedURL () # cannot be executed using the incoming HTTP request method '#oRequestContext .getHTTPMethod () #'" ,
Original file line number Diff line number Diff line change @@ -101,6 +101,7 @@ component serializable="false" accessors="true" {
101
101
102
102
/**
103
103
* The last status text
104
+ *
104
105
* @REMOVED by Jakarta EE, remove by 8
105
106
*/
106
107
property
Original file line number Diff line number Diff line change @@ -317,10 +317,7 @@ component accessors="true" {
317
317
*
318
318
* @return Returns the Response object for chaining
319
319
*/
320
- Response function setErrorMessage (
321
- required errorMessage ,
322
- statusCode
323
- ){
320
+ Response function setErrorMessage ( required errorMessage , statusCode ){
324
321
setError ( true );
325
322
addMessage ( arguments .errorMessage );
326
323
Original file line number Diff line number Diff line change @@ -22,12 +22,12 @@ component
22
22
****************************************************************/
23
23
24
24
property
25
- name = " cachebox"
25
+ name = " cachebox"
26
26
inject = " cachebox"
27
27
delegate = " getCache" ;
28
28
property
29
29
name = " controller"
30
- inject = " coldbox"
30
+ inject = " coldbox"
31
31
delegate = " relocate,runEvent,runRoute" ;
32
32
property name = " flash" inject = " coldbox:flash" ;
33
33
property name = " logBox" inject = " logbox" ;
@@ -1967,10 +1967,7 @@ component
1967
1967
*
1968
1968
* @throws InvalidArgumentException
1969
1969
*/
1970
- function toResponse (
1971
- required body ,
1972
- numeric statusCode = 200
1973
- ){
1970
+ function toResponse ( required body , numeric statusCode = 200 ){
1974
1971
// Arg Check
1975
1972
if ( ! isClosure ( arguments .body ) && ! isCustomFunction ( arguments .body ) && ! isSimpleValue ( arguments .body ) ) {
1976
1973
throw (
Original file line number Diff line number Diff line change @@ -692,9 +692,7 @@ component extends="coldbox.system.web.services.BaseService" accessors="true" {
692
692
// remove it from the string and return string for continued parsing.
693
693
return left ( requestString , len ( arguments .requestString ) - extensionLen - 1 );
694
694
} else if ( variables .router .getThrowOnInvalidExtension () ) {
695
- event .setHTTPHeader (
696
- statusCode = 406
697
- );
695
+ event .setHTTPHeader ( statusCode = 406 );
698
696
throw (
699
697
message = " Invalid requested format extendion: #extension #" ,
700
698
detail = " Invalid Request Format Extension Detected: #extension #. Valid extensions are: #variables .router .getValidExtensions () #" ,
Original file line number Diff line number Diff line change @@ -21,10 +21,10 @@ component extends="coldbox.system.testing.BaseModelTest" {
21
21
flashScope = createEmptyMock ( " coldbox.system.web.flash.MockFlash" );
22
22
mockRequestContext = createMock ( " coldbox.system.web.context.RequestContext" ).init (
23
23
{
24
- eventName : " event" ,
25
- modules : {},
26
- defaultLayout : " " ,
27
- defaultView : " "
24
+ eventName : " event" ,
25
+ modules : {},
26
+ defaultLayout : " " ,
27
+ defaultView : " "
28
28
},
29
29
mockController
30
30
);
@@ -205,9 +205,9 @@ component extends="coldbox.system.testing.BaseModelTest" {
205
205
mockRequestContext .getPrivateCollection (),
206
206
" badAction" ,
207
207
{
208
- message : " Invalid syntax" ,
209
- detail : " oooops!" ,
210
- stackTrace : callStackGet ().toString ()
208
+ message : " Invalid syntax" ,
209
+ detail : " oooops!" ,
210
+ stackTrace : callStackGet ().toString ()
211
211
},
212
212
{}
213
213
);
Original file line number Diff line number Diff line change @@ -546,10 +546,7 @@ component extends="coldbox.system.testing.BaseModelTest" {
546
546
assertEquals ( rd .contenttype , " application/ms-excel" );
547
547
548
548
// Test StatusCodes
549
- event .renderData (
550
- data = " hello" ,
551
- statusCode = " 400"
552
- );
549
+ event .renderData ( data = " hello" , statusCode = " 400" );
553
550
rd = event .getRenderData ();
554
551
assertEquals ( rd .statusCode , " 400" );
555
552
}
You can’t perform that action at this time.
0 commit comments