Split JRPC-Server package into: JRPC-Server-Core , JRPC-Server-HTTP a…

…nd JRPC-Server-TCP to the users can choose which transport use or just use the message processing support. Fixes #18 Fixed comment in JRPServer removing wording about inexistant methods Fixes #15
juliendelplanque · Nov 15, 2019 · 6a64f74 · 6a64f74
1 parent 790d7af
commit 6a64f74
Show file tree

Hide file tree

Showing 22 changed files with 66 additions and 41 deletions.
diff --git a/src/BaselineOfJRPC/BaselineOfJRPC.class.st b/src/BaselineOfJRPC/BaselineOfJRPC.class.st
@@ -23,27 +23,49 @@ BaselineOfJRPC >> projectClass [
 	^ MetacelloCypressBaselineProject
 ]
 
+{ #category : #baselines }
+BaselineOfJRPC >> setUpClientDeploymentPackages: spec [
+
+	spec
+		package: 'JRPC-Client' with: [ spec requires: 'JRPC-Common' ];
+		group: 'Client-Deployment' with: 'JRPC-Client'.
+]
+
 { #category : #baselines }
 BaselineOfJRPC >> setUpPackages: spec [
 
 	spec package: 'JRPC-Common'.
+	self
+		setUpServerDeploymentPackages: spec;
+		setUpClientDeploymentPackages: spec.
+
 	spec
-		package: 'JRPC-Server' with: [ spec requires: 'JRPC-Common' ];
-		group: 'Server-Deployment' with: 'JRPC-Server'.
+		group: 'Deployment'
+		with: #('Server-Deployment' 'HTTP-Transport' 'TCP-Transport' 'Client-Deployment').
+
+	spec
+		package: 'JRPC-Tests' with: [ spec requires: 'Deployment' ];
+		group: 'Tests' with: 'JRPC-Tests'
+]
+
+{ #category : #baselines }
+BaselineOfJRPC >> setUpServerDeploymentPackages: spec [
+
 	spec
 		for: #'pharo6.x'
 		do: [ spec
 				package: 'JRPC-Server-Pharo6';
 				group: 'Server-Deployment' with: 'JRPC-Server-Pharo6'
-	].	
+			].
 	spec
-		package: 'JRPC-Client' with: [ spec requires: 'JRPC-Common' ];
-		group: 'Client-Deployment' with: 'JRPC-Client'.
-	spec group: 'Deployment' with: #('Server-Deployment' 'Client-Deployment').
+		package: 'JRPC-Server-Core' with: [ spec requires: 'JRPC-Common' ];
+		group: 'Server-Deployment' with: 'JRPC-Server-Core'.
 
 	spec
-		package: 'JRPC-Tests' with: [ spec requires: 'Deployment' ];
-		group: 'Tests' with: 'JRPC-Tests'.
-
+		package: 'JRPC-Server-HTTP' with: [ spec requires: 'JRPC-Server-Core' ];
+		group: 'HTTP-Transport' with: 'JRPC-Server-HTTP'.
 
+	spec
+		package: 'JRPC-Server-TCP' with: [ spec requires: 'JRPC-Server-Core' ];
+		group: 'TCP-Transport' with: 'JRPC-Server-TCP'
 ]
diff --git a/src/JRPC-Server/JRPCAbstractHandler.class.st → ...-Server-Core/JRPCAbstractHandler.class.st b/src/JRPC-Server/JRPCAbstractHandler.class.st → ...-Server-Core/JRPCAbstractHandler.class.st
@@ -13,7 +13,7 @@ Class {
 	#instVars : [
 		'methodName'
 	],
-	#category : #'JRPC-Server'
+	#category : #'JRPC-Server-Core-JRPC-Server-Core'
 }
 
 { #category : #accessing }

diff --git a/...rver/JRPCBatchRequestsObject.extension.st → ...Core/JRPCBatchRequestsObject.extension.st b/...rver/JRPCBatchRequestsObject.extension.st → ...Core/JRPCBatchRequestsObject.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #JRPCBatchRequestsObject }
 
-{ #category : #'*JRPC-Server' }
+{ #category : #'*JRPC-Server-Core' }
 JRPCBatchRequestsObject >> beHandledBy: aJRPCMessageProcessor [
 
 	^ JRPCBatchResponseObject new

diff --git a/src/JRPC-Server/JRPCBlockHandler.class.st → ...RPC-Server-Core/JRPCBlockHandler.class.st b/src/JRPC-Server/JRPCBlockHandler.class.st → ...RPC-Server-Core/JRPCBlockHandler.class.st
@@ -9,7 +9,7 @@ Class {
 	#instVars : [
 		'block'
 	],
-	#category : #'JRPC-Server'
+	#category : #'JRPC-Server-Core-JRPC-Server-Core'
 }
 
 { #category : #accessing }

diff --git a/...rver/JRPCErrorResponseObject.extension.st → ...Core/JRPCErrorResponseObject.extension.st b/...rver/JRPCErrorResponseObject.extension.st → ...Core/JRPCErrorResponseObject.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #JRPCErrorResponseObject }
 
-{ #category : #'*JRPC-Server' }
+{ #category : #'*JRPC-Server-Core' }
 JRPCErrorResponseObject >> beHandledBy: aJRPCMessageProcessor [
 
 	"Returns self, this method is executed when a request inside a batch generated an error."

diff --git a/...RPC-Server/JRPCInvalidParameters.class.st → ...erver-Core/JRPCInvalidParameters.class.st b/...RPC-Server/JRPCInvalidParameters.class.st → ...erver-Core/JRPCInvalidParameters.class.st
@@ -4,7 +4,7 @@ I am an error raised when the parameters of the method called are invalid.
 Class {
 	#name : #JRPCInvalidParameters,
 	#superclass : #JRPCError,
-	#category : #'JRPC-Server'
+	#category : #'JRPC-Server-Core-JRPC-Server-Core'
 }
 
 { #category : #converting }

diff --git a/...JRPC-Server/JRPCMessageProcessor.class.st → ...Server-Core/JRPCMessageProcessor.class.st b/...JRPC-Server/JRPCMessageProcessor.class.st → ...Server-Core/JRPCMessageProcessor.class.st
@@ -13,7 +13,7 @@ Class {
 	#instVars : [
 		'handlersByName'
 	],
-	#category : #'JRPC-Server'
+	#category : #'JRPC-Server-Core-JRPC-Server-Core'
 }
 
 { #category : #'handlers management' }

diff --git a/...PC-Server/JRPCMessageSendHandler.class.st → ...rver-Core/JRPCMessageSendHandler.class.st b/...PC-Server/JRPCMessageSendHandler.class.st → ...rver-Core/JRPCMessageSendHandler.class.st
@@ -18,7 +18,7 @@ Class {
 		'receiver',
 		'messageSelector'
 	],
-	#category : #'JRPC-Server'
+	#category : #'JRPC-Server-Core-JRPC-Server-Core'
 }
 
 { #category : #evaluation }

diff --git a/.../JRPCNameOfHandlerIsAlreadyTaken.class.st → .../JRPCNameOfHandlerIsAlreadyTaken.class.st b/.../JRPCNameOfHandlerIsAlreadyTaken.class.st → .../JRPCNameOfHandlerIsAlreadyTaken.class.st
@@ -7,7 +7,7 @@ Class {
 	#instVars : [
 		'handler'
 	],
-	#category : #'JRPC-Server'
+	#category : #'JRPC-Server-Core-JRPC-Server-Core'
 }
 
 { #category : #'instance creation' }

diff --git a/...PC-Server/JRPCNonExistentHandler.class.st → ...rver-Core/JRPCNonExistentHandler.class.st b/...PC-Server/JRPCNonExistentHandler.class.st → ...rver-Core/JRPCNonExistentHandler.class.st
@@ -4,7 +4,7 @@ I am an error raised when the handler required does not exist.
 Class {
 	#name : #JRPCNonExistentHandler,
 	#superclass : #JRPCError,
-	#category : #'JRPC-Server'
+	#category : #'JRPC-Server-Core-JRPC-Server-Core'
 }
 
 { #category : #converting }

diff --git a/...erver/JRPCNotificationObject.extension.st → ...-Core/JRPCNotificationObject.extension.st b/...erver/JRPCNotificationObject.extension.st → ...-Core/JRPCNotificationObject.extension.st
@@ -1,12 +1,12 @@
 Extension { #name : #JRPCNotificationObject }
 
-{ #category : #'*JRPC-Server' }
+{ #category : #'*JRPC-Server-Core' }
 JRPCNotificationObject >> beHandledBy: aJRPCMessageProcessor [
 
 	^ aJRPCMessageProcessor handleJRPCNotificationObject: self
 ]
 
-{ #category : #'*JRPC-Server' }
+{ #category : #'*JRPC-Server-Core' }
 JRPCNotificationObject >> convertErrorToResponse: jrpcError [
 	jrpcError isIncorrectJSON
 		ifTrue: [ ^ jrpcError asJRPCResponseWithId: self id ].

diff --git a/src/JRPC-Server/JRPCPragmaHandler.class.st → ...PC-Server-Core/JRPCPragmaHandler.class.st b/src/JRPC-Server/JRPCPragmaHandler.class.st → ...PC-Server-Core/JRPCPragmaHandler.class.st
@@ -8,7 +8,7 @@ If no method or multiple methods have <jrpc> pragma, an error is raised.
 Class {
 	#name : #JRPCPragmaHandler,
 	#superclass : #JRPCMessageSendHandler,
-	#category : #'JRPC-Server'
+	#category : #'JRPC-Server-Core-JRPC-Server-Core'
 }
 
 { #category : #private }

diff --git a/...RPC-Server/JRPCRequestObject.extension.st → ...erver-Core/JRPCRequestObject.extension.st b/...RPC-Server/JRPCRequestObject.extension.st → ...erver-Core/JRPCRequestObject.extension.st
@@ -1,12 +1,12 @@
 Extension { #name : #JRPCRequestObject }
 
-{ #category : #'*JRPC-Server' }
+{ #category : #'*JRPC-Server-Core' }
 JRPCRequestObject >> beHandledBy: aJRPCMessageProcessor [
 
 	^ aJRPCMessageProcessor handleJRPCRequestObject: self
 ]
 
-{ #category : #'*JRPC-Server' }
+{ #category : #'*JRPC-Server-Core' }
 JRPCRequestObject >> convertErrorToResponse: jrpcError [
 	^ jrpcError asJRPCResponseWithId: self id
 ]
diff --git a/src/JRPC-Server/JRPCServer.class.st → src/JRPC-Server-Core/JRPCServer.class.st b/src/JRPC-Server/JRPCServer.class.st → src/JRPC-Server-Core/JRPCServer.class.st
@@ -1,29 +1,18 @@
 "
 I am an abstract server for JSON-RPC 2.0.
-
-My subclasses define how to handle JSON-RPC objects coming from a client.
-
-To define that, #sendRequest: message should be overriden by my subclasses.
+My subclasses define how to handle JSON-RPC objects coming from a client resolving 
+the transport specific details and delegating later to the messageProcessor the processing
+of the incoming message.
 "
 Class {
 	#name : #JRPCServer,
 	#superclass : #Object,
 	#instVars : [
 		'messageProcessor'
 	],
-	#category : #'JRPC-Server'
+	#category : #'JRPC-Server-Core-JRPC-Server-Core'
 }
 
-{ #category : #'instance creation' }
-JRPCServer class >> http [
-	^ JRPCHTTPServer new
-]
-
-{ #category : #'instance creation' }
-JRPCServer class >> tcp [
-	^ JRPCTCPServer new
-]
-
 { #category : #'handlers management' }
 JRPCServer >> addHandler: aJRPCHandler [
 

diff --git a/src/JRPC-Server-Core/package.st b/src/JRPC-Server-Core/package.st
@@ -0,0 +1 @@
+Package { #name : #'JRPC-Server-Core' }
diff --git a/src/JRPC-Server/JRPCHTTPServer.class.st → src/JRPC-Server-HTTP/JRPCHTTPServer.class.st b/src/JRPC-Server/JRPCHTTPServer.class.st → src/JRPC-Server-HTTP/JRPCHTTPServer.class.st
@@ -9,7 +9,7 @@ Class {
 	#instVars : [
 		'server'
 	],
-	#category : #'JRPC-Server'
+	#category : #'JRPC-Server-HTTP'
 }
 
 { #category : #defaults }

diff --git a/src/JRPC-Server-HTTP/JRPCServer.extension.st b/src/JRPC-Server-HTTP/JRPCServer.extension.st
@@ -0,0 +1,6 @@
+Extension { #name : #JRPCServer }
+
+{ #category : #'*JRPC-Server-HTTP' }
+JRPCServer class >> http [
+	^ JRPCHTTPServer new
+]
diff --git a/src/JRPC-Server-HTTP/package.st b/src/JRPC-Server-HTTP/package.st
@@ -0,0 +1 @@
+Package { #name : #'JRPC-Server-HTTP' }
diff --git a/src/JRPC-Server-TCP/JRPCServer.extension.st b/src/JRPC-Server-TCP/JRPCServer.extension.st
@@ -0,0 +1,6 @@
+Extension { #name : #JRPCServer }
+
+{ #category : #'*JRPC-Server-TCP' }
+JRPCServer class >> tcp [
+	^ JRPCTCPServer new
+]
diff --git a/src/JRPC-Server/JRPCTCPServer.class.st → src/JRPC-Server-TCP/JRPCTCPServer.class.st b/src/JRPC-Server/JRPCTCPServer.class.st → src/JRPC-Server-TCP/JRPCTCPServer.class.st
@@ -12,7 +12,7 @@ Class {
 		'serverLoop',
 		'process'
 	],
-	#category : #'JRPC-Server'
+	#category : #'JRPC-Server-TCP'
 }
 
 { #category : #defaults }

diff --git a/src/JRPC-Server-TCP/package.st b/src/JRPC-Server-TCP/package.st
@@ -0,0 +1 @@
+Package { #name : #'JRPC-Server-TCP' }
diff --git a/src/JRPC-Server/package.st b/src/JRPC-Server/package.st