From 4c34afc9ca022b7e3d36924dd98e40a450939ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20M=C3=BCller?= <christian.muller@wifx.net>
Date: Mon, 21 Nov 2022 15:21:40 +0100
Subject: [PATCH] Cleanup DnsManager

---
 DnsManager.go | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/DnsManager.go b/DnsManager.go
index 571dc64..cbedfa5 100644
--- a/DnsManager.go
+++ b/DnsManager.go
@@ -25,9 +25,9 @@ type DnsConfigurationData struct {
 
 type DnsManager interface {
 	GetPath() dbus.ObjectPath
-	GetPropertyConfiguration() ([]DnsConfigurationData, error)
-	GetPropertyRcManager() (string, error)
 	GetPropertyMode() (string, error)
+	GetPropertyRcManager() (string, error)
+	GetPropertyConfiguration() ([]DnsConfigurationData, error)
 }
 
 type dnsManager struct {
@@ -43,16 +43,20 @@ func (d *dnsManager) GetPath() dbus.ObjectPath {
 	return d.obj.Path()
 }
 
+func (d *dnsManager) GetPropertyMode() (string, error) {
+	return d.getStringProperty(DnsManagerPropertyMode)
+}
+
+func (d *dnsManager) GetPropertyRcManager() (string, error) {
+	return d.getStringProperty(DnsManagerPropertyRcManager)
+}
+
 func (d *dnsManager) GetPropertyConfiguration() ([]DnsConfigurationData, error) {
 	configurations, err := d.getSliceMapStringVariantProperty(DnsManagerPropertyConfiguration)
 	if err != nil {
 		return nil, err
 	}
 
-	// for k, c := range configurations {
-	// 	fmt.Println(k, c)
-	// }
-
 	ret := make([]DnsConfigurationData, len(configurations))
 	for i, conf := range configurations {
 		if serversVar, exist := conf["nameservers"]; exist {
@@ -90,11 +94,3 @@ func (d *dnsManager) GetPropertyConfiguration() ([]DnsConfigurationData, error)
 
 	return ret, nil
 }
-
-func (d *dnsManager) GetPropertyRcManager() (string, error) {
-	return d.getStringProperty(DnsManagerPropertyRcManager)
-}
-
-func (d *dnsManager) GetPropertyMode() (string, error) {
-	return d.getStringProperty(DnsManagerPropertyMode)
-}