Code rework

[ric-plt/submgr.git] / pkg / control / sdl.go

diff --git a/pkg/control/sdl.go b/pkg/control/sdl.go
index 3a083fb..ecf6a85 100644 (file)
--- a/pkg/control/sdl.go
+++ b/pkg/control/sdl.go
@@ -67,8 +67,7 @@ func (c *Control) WriteSubscriptionToSdl(subId uint32, subs *Subscription) error
                return fmt.Errorf("SDL: WriteSubscriptionToSdl() json.Marshal error: %s", err.Error())
        }
 
-       err = c.db.Set(strconv.FormatUint(uint64(subId), 10), jsonData)
-       if err != nil {
+       if err = c.db.Set(strconv.FormatUint(uint64(subId), 10), jsonData); err != nil {
                return fmt.Errorf("SDL: WriteSubscriptionToSdl(): %s", err.Error())
        } else {
                xapp.Logger.Debug("SDL: Subscription written in db. subId = %v", subId)
@@ -97,8 +96,7 @@ func (c *Control) ReadSubscriptionFromSdl(subId uint32) (*Subscription, error) {
                subscriptionInfo := &SubscriptionInfo{}
                jsonSubscriptionInfo := iSubscriptionInfo.(string)
 
-               err := json.Unmarshal([]byte(jsonSubscriptionInfo), subscriptionInfo)
-               if err != nil {
+               if err := json.Unmarshal([]byte(jsonSubscriptionInfo), subscriptionInfo); err != nil {
                        return nil, fmt.Errorf("SDL: ReadSubscriptionFromSdl() json.unmarshal error: %s\n", err.Error())
                }
 
@@ -143,8 +141,7 @@ func (c *Control) CreateSubscription(subscriptionInfo *SubscriptionInfo, jsonSub
 func (c *Control) RemoveSubscriptionFromSdl(subId uint32) error {
 
        key := strconv.FormatUint(uint64(subId), 10)
-       err := c.db.Remove([]string{key})
-       if err != nil {
+       if err := c.db.Remove([]string{key}); err != nil {
                return fmt.Errorf("SDL: RemoveSubscriptionfromSdl(): %s\n", err.Error())
        } else {
                xapp.Logger.Debug("SDL: Subscription removed from db. subId = %v", subId)
@@ -187,8 +184,7 @@ func (c *Control) ReadAllSubscriptionsFromSdl() ([]uint32, map[uint32]*Subscript
                subscriptionInfo := &SubscriptionInfo{}
                jsonSubscriptionInfo := iSubscriptionInfo.(string)
 
-               err := json.Unmarshal([]byte(jsonSubscriptionInfo), subscriptionInfo)
-               if err != nil {
+               if err := json.Unmarshal([]byte(jsonSubscriptionInfo), subscriptionInfo); err != nil {
                        return nil, nil, fmt.Errorf("SDL: ReadAllSubscriptionsFromSdl() json.unmarshal error: %s\n", err.Error())
                }
 
@@ -219,8 +215,7 @@ func removeNumber(s []uint32, removedNum uint32) ([]uint32, error) {
 }
 func (c *Control) RemoveAllSubscriptionsFromSdl() error {
 
-       err := c.db.RemoveAll()
-       if err != nil {
+       if err := c.db.RemoveAll(); err != nil {
                return fmt.Errorf("SDL: RemoveAllSubscriptionsFromSdl(): %s\n", err.Error())
        } else {
                xapp.Logger.Debug("SDL: All subscriptions removed from db")