From 461a7003e5bd3d45fbc3976c79f38d336b80025f Mon Sep 17 00:00:00 2001
From: porosnicuadrian <adrian.porosnicu@itsyscom.com>
Date: Fri, 6 Nov 2020 17:51:02 +0200
Subject: [PATCH] Removed error from Items field

---
 config/datadbcfg.go      | 6 ++----
 config/datadbcfg_test.go | 8 +++-----
 config/stordbcfg.go      | 4 +---
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/config/datadbcfg.go b/config/datadbcfg.go
index e835d25a0..f20c245d2 100644
--- a/config/datadbcfg.go
+++ b/config/datadbcfg.go
@@ -93,9 +93,7 @@ func (dbcfg *DataDbCfg) loadFromJsonCfg(jsnDbCfg *DbJsonCfg) (err error) {
 			if val == nil || !has {
 				val = new(ItemOpt)
 			}
-			if err := val.loadFromJsonCfg(vJsn); err != nil {
-				return err
-			}
+			val.loadFromJsonCfg(vJsn) //To review if the function signature changes
 			dbcfg.Items[kJsn] = val
 		}
 	}
@@ -181,7 +179,7 @@ func (itm *ItemOpt) AsMapInterface() (initialMP map[string]interface{}) {
 	return
 }
 
-func (itm *ItemOpt) loadFromJsonCfg(jsonItm *ItemOptJson) (err error) {
+func (itm *ItemOpt) loadFromJsonCfg(jsonItm *ItemOptJson) {
 	if jsonItm == nil {
 		return
 	}
diff --git a/config/datadbcfg_test.go b/config/datadbcfg_test.go
index 7b4cc2fbc..7af8f071a 100644
--- a/config/datadbcfg_test.go
+++ b/config/datadbcfg_test.go
@@ -130,11 +130,9 @@ func TestItemCfgloadFromJson(t *testing.T) {
 		RouteID:   "randomID",
 	}
 	rcv := new(ItemOpt)
-	if err := rcv.loadFromJsonCfg(nil); err != nil {
-		t.Error(err)
-	} else if err = rcv.loadFromJsonCfg(jsonCfg); err != nil {
-		t.Error(err)
-	} else if !reflect.DeepEqual(rcv, expected) {
+	rcv.loadFromJsonCfg(nil)
+	rcv.loadFromJsonCfg(jsonCfg)
+	if !reflect.DeepEqual(rcv, expected) {
 		t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(rcv))
 	}
 }
diff --git a/config/stordbcfg.go b/config/stordbcfg.go
index 0d4174fa8..babad649d 100644
--- a/config/stordbcfg.go
+++ b/config/stordbcfg.go
@@ -101,9 +101,7 @@ func (dbcfg *StorDbCfg) loadFromJsonCfg(jsnDbCfg *DbJsonCfg) (err error) {
 	if jsnDbCfg.Items != nil {
 		for kJsn, vJsn := range *jsnDbCfg.Items {
 			val := new(ItemOpt)
-			if err := val.loadFromJsonCfg(vJsn); err != nil {
-				return err
-			}
+			val.loadFromJsonCfg(vJsn) //To review if the function signature changes
 			dbcfg.Items[kJsn] = val
 		}
 	}