Merge lp:~chipaca/ubuntu-push/move-proxy-into-endpoint into lp:ubuntu-push

[John Lenton]

moved the object proxy into the endpoint

Moved endpoint's proxy into the object itself, getting rid of some code duplication and such.

[lp:~chipaca/ubuntu-push/move-proxy-into-endpoint]

22. By John Lenton on 2014-01-20

oops, published a private constructor

[Samuele Pedroni (pedronis)]

review: Approve

[lp:~chipaca/ubuntu-push/move-proxy-into-endpoint]

23. By John Lenton on 2014-01-20

simplified the (private) constructor to not return an interface type

=== modified file 'bus/bus.go'
--- bus/bus.go	2014-01-20 13:45:30 +0000
+++ bus/bus.go	2014-01-20 19:10:30 +0000
@@ -63,7 +63,7 @@
 	if err != nil {
 		return nil, err
 	} else {
-		return &endpoint{conn, addr.Name, addr.Path, addr.Interface, log}, nil
+		return newEndpoint(conn, addr, log), nil
 	}
 }
 

=== modified file 'bus/endpoint.go'
--- bus/endpoint.go	2014-01-20 18:09:57 +0000
+++ bus/endpoint.go	2014-01-20 19:10:30 +0000
@@ -38,14 +38,24 @@
 
 type endpoint struct {
 	bus   *dbus.Connection
-	name  string
-	path  string
+	proxy *dbus.ObjectProxy
 	iface string
 	log   logger.Logger
 }
 
+// constructor
+func newEndpoint(bus *dbus.Connection, addr Address, log logger.Logger) *endpoint {
+	endp := new(endpoint)
+	endp.bus = bus
+	endp.proxy = bus.Object(addr.Name, dbus.ObjectPath(addr.Path))
+	endp.iface = addr.Interface
+	endp.log = log
+
+	return endp
+}
+
 // ensure endpoint implements Endpoint
-var _ Endpoint = endpoint{}
+var _ Endpoint = &endpoint{}
 
 /*
    public methods
@@ -56,14 +66,8 @@
 // with the unpacked value. If it's unable to set up the watch it'll return an
 // error. If the watch fails once established, d() is called. Typically f()
 // sends the values over a channel, and d() would close the channel.
-func (endp endpoint) WatchSignal(member string, f func(interface{}), d func()) error {
-	watch, err := endp.bus.WatchSignal(&dbus.MatchRule{
-		Type:      dbus.TypeSignal,
-		Sender:    endp.name,
-		Path:      dbus.ObjectPath(endp.path),
-		Interface: endp.iface,
-		Member:    member,
-	})
+func (endp *endpoint) WatchSignal(member string, f func(interface{}), d func()) error {
+	watch, err := endp.proxy.WatchSignal(endp.iface, member)
 	if err != nil {
 		endp.log.Debugf("Failed to set up the watch: %s", err)
 		return err
@@ -77,9 +81,8 @@
 // Call() invokes the provided member method (on the name, path and interface
 // provided when creating the endpoint). The return value is unpacked before
 // being returned.
-func (endp endpoint) Call(member string, args ...interface{}) (interface{}, error) {
-	proxy := endp.bus.Object(endp.name, dbus.ObjectPath(endp.path))
-	if msg, err := proxy.Call(endp.iface, member, args...); err == nil {
+func (endp *endpoint) Call(member string, args ...interface{}) (interface{}, error) {
+	if msg, err := endp.proxy.Call(endp.iface, member, args...); err == nil {
 		return endp.unpackOneMsg(msg, member)
 	} else {
 		return 0, err
@@ -90,9 +93,8 @@
 // to read a given property on the name, path and interface provided when
 // creating the endpoint. The return value is unpacked into a dbus.Variant,
 // and its value returned.
-func (endp endpoint) GetProperty(property string) (interface{}, error) {
-	proxy := endp.bus.Object(endp.name, dbus.ObjectPath(endp.path))
-	msg, err := proxy.Call("org.freedesktop.DBus.Properties", "Get", endp.iface, property)
+func (endp *endpoint) GetProperty(property string) (interface{}, error) {
+	msg, err := endp.proxy.Call("org.freedesktop.DBus.Properties", "Get", endp.iface, property)
 	if err != nil {
 		return nil, err
 	}
@@ -108,7 +110,7 @@
 }
 
 // Close the connection to dbus.
-func (endp endpoint) Close() {
+func (endp *endpoint) Close() {
 	endp.bus.Close()
 }
 
@@ -117,7 +119,7 @@
 */
 
 // unpackOneMsg unpacks the value from the response msg
-func (endp endpoint) unpackOneMsg(msg *dbus.Message, member string) (interface{}, error) {
+func (endp *endpoint) unpackOneMsg(msg *dbus.Message, member string) (interface{}, error) {
 	var v interface{}
 	if err := msg.Args(&v); err != nil {
 		endp.log.Errorf("Decoding %s: %s", member, err)
@@ -128,7 +130,7 @@
 }
 
 // unpackMessages unpacks the value from the watch
-func (endp endpoint) unpackMessages(watch *dbus.SignalWatch, f func(interface{}), d func(), member string) {
+func (endp *endpoint) unpackMessages(watch *dbus.SignalWatch, f func(interface{}), d func(), member string) {
 	for {
 		msg, ok := <-watch.C
 		if !ok {