X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pkg%2Fsdl%2Ffile.go;h=2d49be77ec48fc10d716289b7e80e6a2ced8a3ea;hb=988d1da4f05b180cac103e59e8118e2fd9f1ddec;hp=638f1af28a60f3e1c9f64fd72368d11747190e31;hpb=92162653c9741f2417d1a36ec1c211d6863d0a68;p=ric-plt%2Frtmgr.git

diff --git a/pkg/sdl/file.go b/pkg/sdl/file.go
index 638f1af..2d49be7 100644
--- a/pkg/sdl/file.go
+++ b/pkg/sdl/file.go
@@ -48,13 +48,14 @@ func NewFile() *File {
 }
 
 func (f *File) ReadAll(file string) (*rtmgr.RicComponents, error) {
-	rtmgr.Logger.Debug("Invoked sdl.ReadAll("+ file +")")
+	rtmgr.Logger.Debug("Invoked sdl.ReadAll(" + file + ")")
 	var rcs *rtmgr.RicComponents
 	jsonFile, err := os.Open(file)
 	if err != nil {
 		return nil, errors.New("cannot open the file due to: " + err.Error())
 	}
 	defer jsonFile.Close()
+
 	byteValue, err := ioutil.ReadAll(jsonFile)
 	if err != nil {
 		return nil, errors.New("cannot read the file due to: " + err.Error())
@@ -70,7 +71,7 @@ func (f *File) ReadAll(file string) (*rtmgr.RicComponents, error) {
 func (f *File) WriteAll(file string, rcs *rtmgr.RicComponents) error {
 	rtmgr.Logger.Debug("Invoked sdl.WriteAll")
 	rtmgr.Logger.Debug("file.fileWriteAll writes into file: " + file)
-	rtmgr.Logger.Debug("file.fileWriteAll writes data: %v", (*rcs))
+	rtmgr.Logger.Debug("file.fileWriteAll writes data: %v", *rcs)
 	byteValue, err := json.Marshal(rcs)
 	if err != nil {
 		return errors.New("cannot convert data due to: " + err.Error())
@@ -82,18 +83,17 @@ func (f *File) WriteAll(file string, rcs *rtmgr.RicComponents) error {
 	return nil
 }
 
-func (f *File) WriteXapps(file string, xapps *[]rtmgr.XApp) error {
-	rtmgr.Logger.Debug("Invoked sdl.WriteXapps")
-	rtmgr.Logger.Debug("file.fileWriteXapps writes into file: " + file)
-	rtmgr.Logger.Debug("file.fileWriteXapps writes data: %v", (*xapps))
+func (f *File) WriteXApps(file string, xApps *[]rtmgr.XApp) error {
+	rtmgr.Logger.Debug("Invoked sdl.WriteXApps")
+	rtmgr.Logger.Debug("file.fileWriteXApps writes into file: " + file)
+	rtmgr.Logger.Debug("file.fileWriteXApps writes data: %v", *xApps)
 
 	ricData, err := NewFile().ReadAll(file)
-	if err != nil || ricData == nil {
+	if err != nil {
 		rtmgr.Logger.Error("cannot get data from sdl interface due to: " + err.Error())
-		return errors.New("cannot read full ric data to modify xapps data, due to:  " + err.Error())
+		return errors.New("cannot read full ric data to modify xApps data, due to:  " + err.Error())
 	}
-
-	ricData.Xapps = *xapps
+	ricData.XApps = *xApps
 
 	byteValue, err := json.Marshal(ricData)
 	if err != nil {