Merge pull request #17 from ba-st/16-Correct-error-handling-depends-o…

…n-the-order-they-are-installed Install additional error handlers in Teapot server after the HTTPClientError one
ba-st · Nov 22, 2018 · 781d071 · 781d071
2 parents 42336f4 + f02db72
commit 781d071
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/source/Stargate-Examples-Tests/PetStoreAPITest.class.st b/source/Stargate-Examples-Tests/PetStoreAPITest.class.st
@@ -55,6 +55,8 @@ PetStoreAPITest >> setUp [
 			{PetsRESTfulController new.
 			PetOrdersRESTfulController new}.
 
+	api on: Error addErrorHandler: [ :error :request | self fail ].
+
 	api
 		install;
 		start

diff --git a/source/Stargate-Model/HTTPBasedRESTfulAPI.class.st b/source/Stargate-Model/HTTPBasedRESTfulAPI.class.st
@@ -6,7 +6,8 @@ Class {
 	#superclass : #Object,
 	#instVars : [
 		'teapotServer',
-		'controllers'
+		'controllers',
+		'errorHandlers'
 	],
 	#category : #'Stargate-Model-Controllers'
 }
@@ -40,18 +41,9 @@ HTTPBasedRESTfulAPI >> beCORSAwareAllowing: origins [
 ]
 
 { #category : #'private - configuring' }
-HTTPBasedRESTfulAPI >> configureHttpClientErrorHandler [
+HTTPBasedRESTfulAPI >> configureErrorHandlers [
 
-	teapotServer
-		exception:
-			HTTPClientError
-				-> [ :clientError :request | 
-					| json |
-
-					json := NeoJSONWriter toStringPretty: clientError.
-					(ZnResponse statusCode: clientError code)
-						entity: (ZnEntity json: json);
-						yourself ]
+	errorHandlers do: [ :errorHandler | teapotServer exception: errorHandler ]
 ]
 
 { #category : #'private - configuring' }
@@ -68,21 +60,30 @@ HTTPBasedRESTfulAPI >> initializeConfiguredBy: configuration installing: aRESTfu
 
 	teapotServer := Teapot
 		configure: configuration , {(#notFoundHandlerClass -> Tea405AwareNotFoundHandler)}.
-	controllers := aRESTfulControllerCollection
+	controllers := aRESTfulControllerCollection.
+	errorHandlers := OrderedCollection new.
+	self
+		on: HTTPClientError
+		addErrorHandler: [ :clientError :request | 
+			| json |
+			json := NeoJSONWriter toStringPretty: clientError.
+			(ZnResponse statusCode: clientError code)
+				entity: (ZnEntity json: json);
+				yourself ]
 ]
 
 { #category : #actions }
 HTTPBasedRESTfulAPI >> install [
 
 	self
 		configureRoutes;
-		configureHttpClientErrorHandler
+		configureErrorHandlers
 ]
 
 { #category : #configuring }
 HTTPBasedRESTfulAPI >> on: exception addErrorHandler: aDyadicBlock [
 
-	teapotServer exception: exception -> aDyadicBlock
+	errorHandlers add: exception -> aDyadicBlock
 ]
 
 { #category : #actions }