Move #exceptionSet: to ZnUtilts

svenvc · Jun 3, 2024 · 1a8ed8f · 1a8ed8f
1 parent bd1f945
commit 1a8ed8f
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 19 deletions.
diff --git a/...ge/ZnLogEvent.class/instance/timestamp.st → ...ge/ZnLogEvent.class/instance/timeStamp.st b/...ge/ZnLogEvent.class/instance/timestamp.st → ...ge/ZnLogEvent.class/instance/timeStamp.st
diff --git a/repository/Zinc-HTTP.package/ZnMultiThreadedServer.class/instance/exceptionSet..st b/repository/Zinc-HTTP.package/ZnMultiThreadedServer.class/instance/exceptionSet..st
diff --git a/...tory/Zinc-HTTP.package/ZnMultiThreadedServer.class/instance/readRequestBadExceptionSet.st b/...tory/Zinc-HTTP.package/ZnMultiThreadedServer.class/instance/readRequestBadExceptionSet.st
@@ -3,6 +3,6 @@ readRequestBadExceptionSet
 	"Return the set of exceptions which, when they occur while reading a request,
 	are interpreted as equivalent to a request parse error or bad request."
 
-	^ self
+	^ ZnUtils
 		exceptionSet:
 			#(#ZnParseError #ZnCharacterEncodingError #ZnUnknownScheme #ZnPortNotANumber #ZnTooManyDictionaryEntries #ZnEntityTooLarge)
diff --git a/...c-HTTP.package/ZnMultiThreadedServer.class/instance/readRequestTerminationExceptionSet.st b/...c-HTTP.package/ZnMultiThreadedServer.class/instance/readRequestTerminationExceptionSet.st
@@ -3,6 +3,6 @@ readRequestTerminationExceptionSet
 	"Return the set of exceptions which, when they occur while reading a request,
 	are interpreted as equivalent to a timeout or connection close."
 
-	^ self
+	^ ZnUtils
 		exceptionSet:
 			#(#ConnectionClosed #ConnectionTimedOut #PrimitiveFailed)
diff --git a/...HTTP.package/ZnMultiThreadedServer.class/instance/writeResponseTerminationExceptionSet.st b/...HTTP.package/ZnMultiThreadedServer.class/instance/writeResponseTerminationExceptionSet.st
@@ -3,4 +3,6 @@ writeResponseTerminationExceptionSet
 	"Return the set of exceptions which, when they occur while writing a response,
 	are interpreted as equivalent to a timeout or connection close."
 
-	^ self exceptionSet: #(#ConnectionClosed #ConnectionTimedOut #PrimitiveFailed)
+	^ ZnUtils 
+		exceptionSet:
+			#(#ConnectionClosed #ConnectionTimedOut #PrimitiveFailed)
diff --git a/repository/Zinc-HTTP.package/ZnUtils.class/class/exceptionSet..st b/repository/Zinc-HTTP.package/ZnUtils.class/class/exceptionSet..st
@@ -0,0 +1,9 @@
+converting
+exceptionSet: classNames
+	^ classNames inject: ExceptionSet new into: [ :set :each |
+		  (Smalltalk globals includesKey: each)
+			  ifTrue: [
+				  set
+					  add: (Smalltalk at: each);
+					  yourself ]
+			  ifFalse: [ set ] ]
diff --git a/repository/Zinc-HTTP.package/monticello.meta/categories.st b/repository/Zinc-HTTP.package/monticello.meta/categories.st
@@ -1,8 +1 @@
-SystemOrganization addCategory: #'Zinc-HTTP'!
-SystemOrganization addCategory: #'Zinc-HTTP-Client-Server'!
-SystemOrganization addCategory: #'Zinc-HTTP-Core'!
-SystemOrganization addCategory: #'Zinc-HTTP-Exceptions'!
-SystemOrganization addCategory: #'Zinc-HTTP-Logging'!
-SystemOrganization addCategory: #'Zinc-HTTP-Streaming'!
-SystemOrganization addCategory: #'Zinc-HTTP-Support'!
-SystemOrganization addCategory: #'Zinc-HTTP-Variables'!
+self packageOrganizer ensurePackage: #'Zinc-HTTP' withTags: #(#'Client-Server' #Core #Exceptions #Logging #Streaming #Support #Variables)!