JsonRPCController instances are now transient

ba-st · Apr 12, 2024 · 9baf8da · 9baf8da
1 parent 9557e2f
commit 9baf8da
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 42 deletions.
diff --git a/source/BaselineOfStargate/BaselineOfStargate.class.st b/source/BaselineOfStargate/BaselineOfStargate.class.st
@@ -11,7 +11,7 @@ BaselineOfStargate >> baseline: spec [
 	<baseline>
 	spec for: #pharo do: [
 		spec postLoadDoIt:
-			#configureResourceRESTfulControllerInstancesAsTransient.
+			#configureControllerInstancesAsTransient.
 		self
 			setUpDependencies: spec;
 			setUpPackages: spec.
@@ -23,9 +23,11 @@ BaselineOfStargate >> baseline: spec [
 ]
 
 { #category : 'baselines' }
-BaselineOfStargate >> configureResourceRESTfulControllerInstancesAsTransient [
+BaselineOfStargate >> configureControllerInstancesAsTransient [
 
-	ResourceRESTfulController makeInstancesDbTransient
+	{
+		ResourceRESTfulController.
+		JsonRPCController } do: #makeInstancesDbTransient
 ]
 
 { #category : 'accessing' }

diff --git a/source/Stargate-JSON-RPC/JRPCSelfContainedBlockHandler.class.st b/source/Stargate-JSON-RPC/JRPCSelfContainedBlockHandler.class.st
@@ -1,13 +1,14 @@
 Class {
-	#name : #JRPCSelfContainedBlockHandler,
-	#superclass : #JRPCMessageSendHandler,
+	#name : 'JRPCSelfContainedBlockHandler',
+	#superclass : 'JRPCMessageSendHandler',
 	#instVars : [
 		'argumentNames'
 	],
-	#category : #'Stargate-JSON-RPC'
+	#category : 'Stargate-JSON-RPC',
+	#package : 'Stargate-JSON-RPC'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 JRPCSelfContainedBlockHandler class >> forProcedureNamed: aString withArgumentNames: argumentNames evaluating: aBlock [
 
 	AssertionChecker enforce: [ aBlock argumentCount = argumentNames size ]
@@ -17,7 +18,7 @@ JRPCSelfContainedBlockHandler class >> forProcedureNamed: aString withArgumentNa
 	^ self new initializeForProcedureNamed: aString withArgumentNames: argumentNames evaluating: aBlock
 ]
 
-{ #category : #evaluation }
+{ #category : 'evaluation' }
 JRPCSelfContainedBlockHandler >> executeWithArguments: anArrayOrDictionary [
 
 	| arguments |
@@ -31,7 +32,7 @@ JRPCSelfContainedBlockHandler >> executeWithArguments: anArrayOrDictionary [
 	^ self send: self messageSelector to: self receiver with: arguments
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 JRPCSelfContainedBlockHandler >> initializeForProcedureNamed: aString withArgumentNames: theArgumentNames evaluating: aBlock [
 
 	self
@@ -40,19 +41,19 @@ JRPCSelfContainedBlockHandler >> initializeForProcedureNamed: aString withArgume
 	argumentNames := theArgumentNames collect: #asString
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 JRPCSelfContainedBlockHandler >> messageSelector [
 
 	^ #valueWithArguments:
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 JRPCSelfContainedBlockHandler >> parametersNames [
 
 	^ argumentNames
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 JRPCSelfContainedBlockHandler >> send: aSelector to: aBlock with: arguments [
 
 	^ super send: aSelector to: aBlock with: ( Array with: arguments )

diff --git a/source/Stargate-JSON-RPC/JsonRPCController.class.st b/source/Stargate-JSON-RPC/JsonRPCController.class.st
@@ -1,14 +1,18 @@
 Class {
-	#name : #JsonRPCController,
-	#superclass : #Object,
+	#name : 'JsonRPCController',
+	#superclass : 'Object',
 	#instVars : [
 		'requestHandler',
 		'procedureDefinitions'
 	],
-	#category : #'Stargate-JSON-RPC'
+	#category : 'Stargate-JSON-RPC',
+	#package : 'Stargate-JSON-RPC',
+	#'gs_options' : [
+		'dbTransient'
+	]
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 JsonRPCController class >> configuredBy: configurationAction [
 
 	| options |
@@ -18,42 +22,45 @@ JsonRPCController class >> configuredBy: configurationAction [
 	^ self with: options
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 JsonRPCController class >> with: options [
 
 	^self new initializeWith: options
 ]
 
-{ #category : #configuring }
+{ #category : 'configuring' }
 JsonRPCController >> configureAvailableProcedures [
 
 	procedureDefinitions do: [ :definition | definition value: requestHandler ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 JsonRPCController >> endpoint [
 
 	^ self requestHandler endpoint
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 JsonRPCController >> initializeWith: options [
 
 	procedureDefinitions := options at: #procedureDefinitions.
-	requestHandler := JsonRPCRequestHandler handling: ( options at: #endpoint ).
-	options at: #debugMode ifPresent: [ :boolean | requestHandler debugMode: boolean ].
-	options at: #errorHandlers
-		ifPresent: [ :handlers | 
-		handlers do: [ :errorHandler | requestHandler addErrorHandler: errorHandler ] ]
+	requestHandler := JsonRPCRequestHandler handling:
+		                  (options at: #endpoint).
+	options
+		at: #debugMode
+		ifPresent: [ :boolean | requestHandler debugMode: boolean ].
+	options at: #errorHandlers ifPresent: [ :handlers |
+		handlers do: [ :errorHandler |
+			requestHandler addErrorHandler: errorHandler ] ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 JsonRPCController >> requestHandler [
 
 	^ requestHandler
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 JsonRPCController >> routes [
 
 	^ Array with: ( RouteSpecification handling: #POST
@@ -62,7 +69,7 @@ JsonRPCController >> routes [
 			    requestHandler process: httpRequest within: requestContext ] )
 ]
 
-{ #category : #configuring }
+{ #category : 'configuring' }
 JsonRPCController >> serverUrl: aServerUrl [
 
 	requestHandler serverUrl: aServerUrl.

diff --git a/source/Stargate-JSON-RPC/JsonRPCRequestHandler.class.st b/source/Stargate-JSON-RPC/JsonRPCRequestHandler.class.st
@@ -2,53 +2,54 @@
 I represent a JSON RPC request handler. I'm capable of processing RPC calls.
 "
 Class {
-	#name : #JsonRPCRequestHandler,
-	#superclass : #Object,
+	#name : 'JsonRPCRequestHandler',
+	#superclass : 'Object',
 	#instVars : [
 		'messageProcessor',
 		'acceptNegotiator',
 		'resourceLocator'
 	],
-	#category : #'Stargate-JSON-RPC'
+	#category : 'Stargate-JSON-RPC',
+	#package : 'Stargate-JSON-RPC'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 JsonRPCRequestHandler class >> handling: anEndpoint [
 
 	^ self new initializeResolvingLocationWith: ( ResourceLocator handling: anEndpoint )
 ]
 
-{ #category : #configuring }
+{ #category : 'configuring' }
 JsonRPCRequestHandler >> addErrorHandler: anErrorHandler [
 
 	messageProcessor addErrorHandler: anErrorHandler
 ]
 
-{ #category : #configuring }
+{ #category : 'configuring' }
 JsonRPCRequestHandler >> addHandlerNamed: aString evaluating: aBlock [
 
 	messageProcessor addHandlerNamed: aString block: aBlock
 ]
 
-{ #category : #configuring }
+{ #category : 'configuring' }
 JsonRPCRequestHandler >> addHandlerNamed: aString withArgumentNames: argumentNames evaluating: aBlock [
 
 	messageProcessor addHandlerNamed: aString withArgumentsNamed: argumentNames evaluating: aBlock
 ]
 
-{ #category : #configuring }
+{ #category : 'configuring' }
 JsonRPCRequestHandler >> debugMode: aBoolean [
 
 	messageProcessor debugMode: aBoolean
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 JsonRPCRequestHandler >> endpoint [
 
 	^ resourceLocator endpoint
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 JsonRPCRequestHandler >> initialize [
 
 	super initialize.
@@ -57,13 +58,13 @@ JsonRPCRequestHandler >> initialize [
 		accepting: ( Array with: ZnMimeType applicationJson )
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 JsonRPCRequestHandler >> initializeResolvingLocationWith: aResourceLocator [
 
 	resourceLocator := aResourceLocator
 ]
 
-{ #category : #API }
+{ #category : 'API' }
 JsonRPCRequestHandler >> process: httpRequest within: requestContext [
 
 	AssertionChecker
@@ -77,7 +78,7 @@ JsonRPCRequestHandler >> process: httpRequest within: requestContext [
 		ifNotEmpty: [ :rpcResponse | ZnResponse ok: ( ZnEntity json: rpcResponse ) ]
 ]
 
-{ #category : #configuring }
+{ #category : 'configuring' }
 JsonRPCRequestHandler >> serverUrl: aServerUrl [
 
 	resourceLocator baseUrl: aServerUrl

diff --git a/source/Stargate-JSON-RPC/package.st b/source/Stargate-JSON-RPC/package.st
@@ -1 +1 @@
-Package { #name : #'Stargate-JSON-RPC' }
+Package { #name : 'Stargate-JSON-RPC' }