better request.Context

MarcGrol · Feb 23, 2018 · 6867a2b · 6867a2b
1 parent 4efdf76
commit 6867a2b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/generator/event/wrappers_test.tmpl.go b/generator/event/wrappers_test.tmpl.go
@@ -30,7 +30,7 @@ func Test{{.Name}}Wrapper(t *testing.T) {
 			{{end -}}
 		{{end -}}
     }
-    wrapped, err := event.Wrap(request.NewBuilder().SessionUID("test_session").Build())
+    wrapped, err := event.Wrap(request.New(request.SessionUID("test_session")))
     assert.NoError(t, err)
     assert.True(t, Is{{.Name}}(wrapped))
     assert.Equal(t, {{GetAggregateName . }}AggregateName, wrapped.AggregateName)

diff --git a/generator/eventService/handlers.tmpl.go b/generator/eventService/handlers.tmpl.go
@@ -95,20 +95,19 @@ func (es *{{$eventServiceName}}) httpHandleEventAsync() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		c := ctx.New.CreateContext(r)
 
-		rcb := request.NewMinimalContextBuilder(c,r)
+		rc := request.NewMinimalContext(c,r)
 
 		// read and parse request body
 		var envlp envelope.Envelope
 		err := json.NewDecoder(r.Body).Decode(&envlp)
 		if err != nil {
-			errorh.HandleHttpError(c, rcb.Build(), errorh.NewInvalidInputErrorf(1, "Error parsing request body: %s", err), w, r)
+			errorh.HandleHttpError(c, rc, errorh.NewInvalidInputErrorf(1, "Error parsing request body: %s", err), w, r)
 			return
 		}
 
-		rc := rcb.RequestUID( envlp.UUID ).
-		    SessionUID( envlp.SessionUID ).
-		    RequestUID(envlp.UUID). // pas a stable identifyer that make write of resulting events idempotent
-            Build()
+		rc.Set(request.RequestUID( envlp.UUID ),
+		    request.SessionUID( envlp.SessionUID ),
+		    request.RequestUID(envlp.UUID)) // pas a stable identifyer that make write of resulting events idempotent
 
 		err = es.handleEventAsync(c, rc, envlp.AggregateName, envlp)
 		if err != nil {

diff --git a/generator/rest/httpHandlers.tmpl.go b/generator/rest/httpHandlers.tmpl.go
@@ -54,9 +54,7 @@ func {{$oper.Name}}( service *{{$service.Name}} ) http.HandlerFunc {
 			preLogicHook( nil, w, r )
         {{end -}}
 
-        rc := {{ $extractRequestContextMethod }}Builder(c, r).
-		       Transactional({{ IsRestOperationTransactional $service .}}).
-               Build()
+        rc := {{ $extractRequestContextMethod }}(c, r)
 
         {{if (not $noValidation) and (HasRequestContext $oper) -}}
         	err = validateRequestContext(c, rc, {{GetRestOperationRolesString $oper}})
@@ -159,8 +157,9 @@ func {{$oper.Name}}( service *{{$service.Name}} ) http.HandlerFunc {
 			}
 		{{end}}
 
-        // call business logic: transactional: {{ IsRestOperationTransactional $service .}}
-        {{range GetOutputArgsDeclaration . -}}
+        // call business logic
+        rc.Set(request.Transactional({{ IsRestOperationTransactional $service .}}))
+		{{range GetOutputArgsDeclaration . -}}
 			{{.}}
 		{{end -}}
 		{{if IsRestOperationTransactional $service . -}}