Decruft the broker by removing Event interface (#1940)

server/grpc/grpc.go

@@ -753,10 +753,6 @@ func (g *grpcServer) Register() error {
 			opts = append(opts, broker.SubscribeContext(cx))
 		}
 
-		if !sb.Options().AutoAck {
-			opts = append(opts, broker.DisableAutoAck())
-		}
-
 		if logger.V(logger.InfoLevel, logger.DefaultLogger) {
 			logger.Infof("Subscribing to topic: %s", sb.Topic())
 		}

server/grpc/subscriber.go

@@ -167,7 +167,7 @@ func validateSubscriber(sub server.Subscriber) error {
 }
 
 func (g *grpcServer) createSubHandler(sb *subscriber, opts server.Options) broker.Handler {
-	return func(p broker.Event) (err error) {
+	return func(msg *broker.Message) (err error) {
 
 		defer func() {
 			if r := recover(); r != nil {
@@ -179,7 +179,6 @@ func (g *grpcServer) createSubHandler(sb *subscriber, opts server.Options) broke
 			}
 		}()
 
-		msg := p.Message()
 		// if we don't have headers, create empty map
 		if msg.Header == nil {
 			msg.Header = make(map[string]string)

server/mucp/rpc_event.go

@@ -1,38 +0,0 @@
-package mucp
-
-import (
-	"github.com/micro/go-micro/v3/broker"
-	"github.com/micro/go-micro/v3/transport"
-)
-
-// event is a broker event we handle on the server transport
-type event struct {
-	err     error
-	message *broker.Message
-}
-
-func (e *event) Ack() error {
-	// there is no ack support
-	return nil
-}
-
-func (e *event) Message() *broker.Message {
-	return e.message
-}
-
-func (e *event) Error() error {
-	return e.err
-}
-
-func (e *event) Topic() string {
-	return e.message.Header["Micro-Topic"]
-}
-
-func newEvent(msg transport.Message) *event {
-	return &event{
-		message: &broker.Message{
-			Header: msg.Header,
-			Body:   msg.Body,
-		},
-	}
-}

server/mucp/rpc_server.go

@@ -79,10 +79,7 @@ func newServer(opts ...server.Option) server.Server {
 
 // HandleEvent handles inbound messages to the service directly
 // TODO: handle requests from an event. We won't send a response.
-func (s *rpcServer) HandleEvent(e broker.Event) error {
-	// formatting horrible cruft
-	msg := e.Message()
-
+func (s *rpcServer) HandleEvent(msg *broker.Message) error {
 	if msg.Header == nil {
 		// create empty map in case of headers empty to avoid panic later
 		msg.Header = make(map[string]string)
@@ -190,10 +187,8 @@ func (s *rpcServer) ServeConn(sock transport.Socket) {
 		// Micro-Service is a request
 		// Micro-Topic is a message
 		if t := msg.Header["Micro-Topic"]; len(t) > 0 {
-			// process the event
-			ev := newEvent(msg)
 			// TODO: handle the error event
-			if err := s.HandleEvent(ev); err != nil {
+			if err := s.HandleEvent(newMessage(msg)); err != nil {
 				msg.Header["Micro-Error"] = err.Error()
 			}
 			// write back some 200
@@ -706,10 +701,6 @@ func (s *rpcServer) Register() error {
 			opts = append(opts, broker.SubscribeContext(cx))
 		}
 
-		if !sb.Options().AutoAck {
-			opts = append(opts, broker.DisableAutoAck())
-		}
-
 		sub, err := config.Broker.Subscribe(sb.Topic(), s.HandleEvent, opts...)
 		if err != nil {
 			return err

server/mucp/subscriber.go

@@ -6,6 +6,8 @@ import (
 
 	"github.com/micro/go-micro/v3/registry"
 	"github.com/micro/go-micro/v3/server"
+	"github.com/micro/go-micro/v3/broker"
+	"github.com/micro/go-micro/v3/transport"
 )
 
 const (
@@ -28,6 +30,13 @@ type subscriber struct {
 	opts       server.SubscriberOptions
 }
 
+func newMessage(msg transport.Message) *broker.Message {
+        return &broker.Message{
+                Header: msg.Header,
+                Body:   msg.Body,
+        }
+}
+
 func newSubscriber(topic string, sub interface{}, opts ...server.SubscriberOption) server.Subscriber {
 	options := server.SubscriberOptions{
 		AutoAck: true,