Skip to content
Snippets Groups Projects
Commit cb326db8 authored by Fabian Seidl's avatar Fabian Seidl
Browse files

changed name Object to Identifier

parent 4659f3c9
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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()
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment