From cb326db8e8e0329b78af0f9367cecf11eff6f35e Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.b.seidl@stud.h-da.de>
Date: Tue, 14 Jun 2022 15:00:46 +0200
Subject: [PATCH] changed name Object to Identifier

---
 controller/nucleus/databaseDeviceStore.go | 4 ++--
 controller/nucleus/databasePndStore.go    | 2 +-
 controller/nucleus/databaseSbiStore.go    | 2 +-
 controller/nucleus/errors/errors.go       | 8 ++++----
 controller/rbac/databaseRoleStore.go      | 4 ++--
 controller/rbac/databaseUserStore.go      | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/controller/nucleus/databaseDeviceStore.go b/controller/nucleus/databaseDeviceStore.go
index 4aea432e7..dac31e643 100644
--- a/controller/nucleus/databaseDeviceStore.go
+++ b/controller/nucleus/databaseDeviceStore.go
@@ -66,7 +66,7 @@ func (s *DatabaseDeviceStore) getByID(idOfDevice uuid.UUID) (device.LoadedDevice
 	err := result.Decode(&loadedDevice)
 	if err != nil {
 		log.Printf("Failed marshalling %v", err)
-		return loadedDevice, errors.ErrCouldNotMarshall{Object: idOfDevice, Type: reflect.TypeOf(loadedDevice), Err: err}
+		return loadedDevice, errors.ErrCouldNotMarshall{Identifier: idOfDevice, Type: reflect.TypeOf(loadedDevice), Err: err}
 	}
 
 	return loadedDevice, nil
@@ -89,7 +89,7 @@ func (s *DatabaseDeviceStore) getByName(nameOfDevice string) (device.LoadedDevic
 	err := result.Decode(&loadedDevice)
 	if err != nil {
 		log.Printf("Failed marshalling %v", err)
-		return loadedDevice, errors.ErrCouldNotMarshall{Object: nameOfDevice, Type: reflect.TypeOf(loadedDevice), Err: err}
+		return loadedDevice, errors.ErrCouldNotMarshall{Identifier: nameOfDevice, Type: reflect.TypeOf(loadedDevice), Err: err}
 	}
 
 	return loadedDevice, nil
diff --git a/controller/nucleus/databasePndStore.go b/controller/nucleus/databasePndStore.go
index a1eb29323..fd5050843 100644
--- a/controller/nucleus/databasePndStore.go
+++ b/controller/nucleus/databasePndStore.go
@@ -46,7 +46,7 @@ func (s *DatabasePndStore) Get(query store.Query) (networkdomain.NetworkDomain,
 	if err != nil {
 		log.Printf("Failed marshalling %v", err)
 
-		return nil, errors.ErrCouldNotMarshall{Object: query.ID, Type: reflect.TypeOf(loadedPND), Err: err}
+		return nil, errors.ErrCouldNotMarshall{Identifier: query.ID, Type: reflect.TypeOf(loadedPND), Err: err}
 	}
 
 	csbiClient, err := s.getCsbiClient()
diff --git a/controller/nucleus/databaseSbiStore.go b/controller/nucleus/databaseSbiStore.go
index cadd71981..5ed594fcb 100644
--- a/controller/nucleus/databaseSbiStore.go
+++ b/controller/nucleus/databaseSbiStore.go
@@ -77,7 +77,7 @@ func (s *DatabaseSbiStore) Get(query store.Query) (southbound.LoadedSbi, error)
 	if err != nil {
 		log.Printf("Failed marshalling %v", err)
 
-		return loadedSbi, errors.ErrCouldNotMarshall{Object: query.ID, Type: reflect.TypeOf(loadedSbi), Err: err}
+		return loadedSbi, errors.ErrCouldNotMarshall{Identifier: query.ID, Type: reflect.TypeOf(loadedSbi), Err: err}
 	}
 
 	return loadedSbi, nil
diff --git a/controller/nucleus/errors/errors.go b/controller/nucleus/errors/errors.go
index 43cf54e9a..ddc562044 100644
--- a/controller/nucleus/errors/errors.go
+++ b/controller/nucleus/errors/errors.go
@@ -162,13 +162,13 @@ func (e ErrTypeNotSupported) Error() string {
 // ErrCouldNotMarshall implements Error interface and is called if a
 // database respone can not be parsed.
 type ErrCouldNotMarshall struct {
-	Object any
-	Type   any
-	Err    error
+	Identifier any
+	Type       any
+	Err        error
 }
 
 func (e ErrCouldNotMarshall) Error() string {
-	return fmt.Sprintf("could not marshall Object: %v of Type: %v, Internal error: %v", e.Object, e.Type, e.Err)
+	return fmt.Sprintf("could not marshall Identifier: %v of Type: %v, Internal error: %v", e.Identifier, e.Type, e.Err)
 }
 
 // ErrCouldNotUpdate implements the Error interface and is called if a
diff --git a/controller/rbac/databaseRoleStore.go b/controller/rbac/databaseRoleStore.go
index 8d1ac67a7..2c821a14e 100644
--- a/controller/rbac/databaseRoleStore.go
+++ b/controller/rbac/databaseRoleStore.go
@@ -95,7 +95,7 @@ func (s *DatabaseRoleStore) getByID(idOfRole uuid.UUID) (rbac.LoadedRole, error)
 	err := result.Decode(&loadedRole)
 	if err != nil {
 		log.Printf("Failed marshalling %v", err)
-		return loadedRole, errors.ErrCouldNotMarshall{Object: idOfRole, Type: reflect.TypeOf(loadedRole), Err: err}
+		return loadedRole, errors.ErrCouldNotMarshall{Identifier: idOfRole, Type: reflect.TypeOf(loadedRole), Err: err}
 	}
 
 	return loadedRole, nil
@@ -118,7 +118,7 @@ func (s *DatabaseRoleStore) getByName(nameOfRole string) (rbac.LoadedRole, error
 	err := result.Decode(&loadedRole)
 	if err != nil {
 		log.Printf("Failed marshalling %v", err)
-		return loadedRole, errors.ErrCouldNotMarshall{Object: nameOfRole, Type: reflect.TypeOf(loadedRole), Err: err}
+		return loadedRole, errors.ErrCouldNotMarshall{Identifier: nameOfRole, Type: reflect.TypeOf(loadedRole), Err: err}
 	}
 
 	return loadedRole, nil
diff --git a/controller/rbac/databaseUserStore.go b/controller/rbac/databaseUserStore.go
index dda2bc790..f74676f76 100644
--- a/controller/rbac/databaseUserStore.go
+++ b/controller/rbac/databaseUserStore.go
@@ -95,7 +95,7 @@ func (s *DatabaseUserStore) getByID(idOfUser uuid.UUID) (rbac.LoadedUser, error)
 	err := result.Decode(&loadedUser)
 	if err != nil {
 		log.Printf("Failed marshalling %v", err)
-		return loadedUser, errors.ErrCouldNotMarshall{Object: idOfUser, Type: reflect.TypeOf(loadedUser), Err: err}
+		return loadedUser, errors.ErrCouldNotMarshall{Identifier: idOfUser, Type: reflect.TypeOf(loadedUser), Err: err}
 	}
 
 	return loadedUser, nil
@@ -118,7 +118,7 @@ func (s *DatabaseUserStore) getByName(nameOfUser string) (rbac.LoadedUser, error
 	err := result.Decode(&loadedUser)
 	if err != nil {
 		log.Printf("Failed marshalling %v", err)
-		return loadedUser, errors.ErrCouldNotMarshall{Object: nameOfUser, Type: reflect.TypeOf(loadedUser), Err: err}
+		return loadedUser, errors.ErrCouldNotMarshall{Identifier: nameOfUser, Type: reflect.TypeOf(loadedUser), Err: err}
 	}
 
 	return loadedUser, nil
-- 
GitLab