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

removed reflect call and used fmt formatting instead

parent cb326db8
No related branches found
No related tags found
No related merge requests found
Pipeline #104987 passed
...@@ -2,7 +2,6 @@ package nucleus ...@@ -2,7 +2,6 @@ package nucleus
import ( import (
"fmt" "fmt"
"reflect"
"code.fbi.h-da.de/danet/gosdn/controller/interfaces/device" "code.fbi.h-da.de/danet/gosdn/controller/interfaces/device"
"code.fbi.h-da.de/danet/gosdn/controller/nucleus/database" "code.fbi.h-da.de/danet/gosdn/controller/nucleus/database"
...@@ -66,7 +65,7 @@ func (s *DatabaseDeviceStore) getByID(idOfDevice uuid.UUID) (device.LoadedDevice ...@@ -66,7 +65,7 @@ func (s *DatabaseDeviceStore) getByID(idOfDevice uuid.UUID) (device.LoadedDevice
err := result.Decode(&loadedDevice) err := result.Decode(&loadedDevice)
if err != nil { if err != nil {
log.Printf("Failed marshalling %v", err) log.Printf("Failed marshalling %v", err)
return loadedDevice, errors.ErrCouldNotMarshall{Identifier: idOfDevice, Type: reflect.TypeOf(loadedDevice), Err: err} return loadedDevice, errors.ErrCouldNotMarshall{Identifier: idOfDevice, Type: loadedDevice, Err: err}
} }
return loadedDevice, nil return loadedDevice, nil
...@@ -89,7 +88,7 @@ func (s *DatabaseDeviceStore) getByName(nameOfDevice string) (device.LoadedDevic ...@@ -89,7 +88,7 @@ func (s *DatabaseDeviceStore) getByName(nameOfDevice string) (device.LoadedDevic
err := result.Decode(&loadedDevice) err := result.Decode(&loadedDevice)
if err != nil { if err != nil {
log.Printf("Failed marshalling %v", err) log.Printf("Failed marshalling %v", err)
return loadedDevice, errors.ErrCouldNotMarshall{Identifier: nameOfDevice, Type: reflect.TypeOf(loadedDevice), Err: err} return loadedDevice, errors.ErrCouldNotMarshall{Identifier: nameOfDevice, Type: loadedDevice, Err: err}
} }
return loadedDevice, nil return loadedDevice, nil
...@@ -115,7 +114,7 @@ func (s *DatabaseDeviceStore) GetAll() ([]device.LoadedDevice, error) { ...@@ -115,7 +114,7 @@ func (s *DatabaseDeviceStore) GetAll() ([]device.LoadedDevice, error) {
if err != nil { if err != nil {
log.Printf("Failed marshalling %v", err) log.Printf("Failed marshalling %v", err)
return nil, errors.ErrCouldNotMarshall{Type: reflect.TypeOf(loadedDevices), Err: err} return nil, errors.ErrCouldNotMarshall{Type: loadedDevices, Err: err}
} }
return loadedDevices, nil return loadedDevices, nil
......
package nucleus package nucleus
import ( import (
"reflect"
"code.fbi.h-da.de/danet/gosdn/controller/interfaces/device" "code.fbi.h-da.de/danet/gosdn/controller/interfaces/device"
"code.fbi.h-da.de/danet/gosdn/controller/interfaces/networkdomain" "code.fbi.h-da.de/danet/gosdn/controller/interfaces/networkdomain"
...@@ -46,7 +44,7 @@ func (s *DatabasePndStore) Get(query store.Query) (networkdomain.NetworkDomain, ...@@ -46,7 +44,7 @@ func (s *DatabasePndStore) Get(query store.Query) (networkdomain.NetworkDomain,
if err != nil { if err != nil {
log.Printf("Failed marshalling %v", err) log.Printf("Failed marshalling %v", err)
return nil, errors.ErrCouldNotMarshall{Identifier: query.ID, Type: reflect.TypeOf(loadedPND), Err: err} return nil, errors.ErrCouldNotMarshall{Identifier: query.ID, Type: loadedPND, Err: err}
} }
csbiClient, err := s.getCsbiClient() csbiClient, err := s.getCsbiClient()
...@@ -89,7 +87,7 @@ func (s *DatabasePndStore) GetAll() ([]networkdomain.NetworkDomain, error) { ...@@ -89,7 +87,7 @@ func (s *DatabasePndStore) GetAll() ([]networkdomain.NetworkDomain, error) {
if err != nil { if err != nil {
log.Printf("Failed marshalling %v", err) log.Printf("Failed marshalling %v", err)
return nil, errors.ErrCouldNotMarshall{Type: reflect.TypeOf(loadedPnds), Err: err} return nil, errors.ErrCouldNotMarshall{Type: loadedPnds, Err: err}
} }
csbiClient, err := s.getCsbiClient() csbiClient, err := s.getCsbiClient()
......
package nucleus package nucleus
import ( import (
"reflect"
"code.fbi.h-da.de/danet/gosdn/controller/interfaces/southbound" "code.fbi.h-da.de/danet/gosdn/controller/interfaces/southbound"
"code.fbi.h-da.de/danet/gosdn/controller/nucleus/database" "code.fbi.h-da.de/danet/gosdn/controller/nucleus/database"
"code.fbi.h-da.de/danet/gosdn/controller/nucleus/errors" "code.fbi.h-da.de/danet/gosdn/controller/nucleus/errors"
...@@ -77,7 +75,7 @@ func (s *DatabaseSbiStore) Get(query store.Query) (southbound.LoadedSbi, error) ...@@ -77,7 +75,7 @@ func (s *DatabaseSbiStore) Get(query store.Query) (southbound.LoadedSbi, error)
if err != nil { if err != nil {
log.Printf("Failed marshalling %v", err) log.Printf("Failed marshalling %v", err)
return loadedSbi, errors.ErrCouldNotMarshall{Identifier: query.ID, Type: reflect.TypeOf(loadedSbi), Err: err} return loadedSbi, errors.ErrCouldNotMarshall{Identifier: query.ID, Type: loadedSbi, Err: err}
} }
return loadedSbi, nil return loadedSbi, nil
...@@ -103,7 +101,7 @@ func (s *DatabaseSbiStore) GetAll() ([]southbound.LoadedSbi, error) { ...@@ -103,7 +101,7 @@ func (s *DatabaseSbiStore) GetAll() ([]southbound.LoadedSbi, error) {
if err != nil { if err != nil {
log.Printf("Failed marshalling %v", err) log.Printf("Failed marshalling %v", err)
return nil, errors.ErrCouldNotMarshall{Type: reflect.TypeOf(loadedSbis), Err: err} return nil, errors.ErrCouldNotMarshall{Type: loadedSbis, Err: err}
} }
return loadedSbis, nil return loadedSbis, nil
......
...@@ -168,7 +168,7 @@ type ErrCouldNotMarshall struct { ...@@ -168,7 +168,7 @@ type ErrCouldNotMarshall struct {
} }
func (e ErrCouldNotMarshall) Error() string { func (e ErrCouldNotMarshall) Error() string {
return fmt.Sprintf("could not marshall Identifier: %v of Type: %v, Internal error: %v", e.Identifier, e.Type, e.Err) return fmt.Sprintf("could not marshall Identifier: %v of Type: %T, Internal error: %v", e.Identifier, e.Type, e.Err)
} }
// ErrCouldNotUpdate implements the Error interface and is called if a // ErrCouldNotUpdate implements the Error interface and is called if a
......
package rbac package rbac
import ( import (
"reflect"
"code.fbi.h-da.de/danet/gosdn/controller/interfaces/rbac" "code.fbi.h-da.de/danet/gosdn/controller/interfaces/rbac"
"code.fbi.h-da.de/danet/gosdn/controller/nucleus/database" "code.fbi.h-da.de/danet/gosdn/controller/nucleus/database"
"code.fbi.h-da.de/danet/gosdn/controller/nucleus/errors" "code.fbi.h-da.de/danet/gosdn/controller/nucleus/errors"
...@@ -95,7 +93,7 @@ func (s *DatabaseRoleStore) getByID(idOfRole uuid.UUID) (rbac.LoadedRole, error) ...@@ -95,7 +93,7 @@ func (s *DatabaseRoleStore) getByID(idOfRole uuid.UUID) (rbac.LoadedRole, error)
err := result.Decode(&loadedRole) err := result.Decode(&loadedRole)
if err != nil { if err != nil {
log.Printf("Failed marshalling %v", err) log.Printf("Failed marshalling %v", err)
return loadedRole, errors.ErrCouldNotMarshall{Identifier: idOfRole, Type: reflect.TypeOf(loadedRole), Err: err} return loadedRole, errors.ErrCouldNotMarshall{Identifier: idOfRole, Type: loadedRole, Err: err}
} }
return loadedRole, nil return loadedRole, nil
...@@ -118,7 +116,7 @@ func (s *DatabaseRoleStore) getByName(nameOfRole string) (rbac.LoadedRole, error ...@@ -118,7 +116,7 @@ func (s *DatabaseRoleStore) getByName(nameOfRole string) (rbac.LoadedRole, error
err := result.Decode(&loadedRole) err := result.Decode(&loadedRole)
if err != nil { if err != nil {
log.Printf("Failed marshalling %v", err) log.Printf("Failed marshalling %v", err)
return loadedRole, errors.ErrCouldNotMarshall{Identifier: nameOfRole, Type: reflect.TypeOf(loadedRole), Err: err} return loadedRole, errors.ErrCouldNotMarshall{Identifier: nameOfRole, Type: loadedRole, Err: err}
} }
return loadedRole, nil return loadedRole, nil
...@@ -144,7 +142,7 @@ func (s *DatabaseRoleStore) GetAll() ([]rbac.LoadedRole, error) { ...@@ -144,7 +142,7 @@ func (s *DatabaseRoleStore) GetAll() ([]rbac.LoadedRole, error) {
if err != nil { if err != nil {
log.Printf("Failed marshalling %v", err) log.Printf("Failed marshalling %v", err)
return nil, errors.ErrCouldNotMarshall{Type: reflect.TypeOf(loadedRoles), Err: err} return nil, errors.ErrCouldNotMarshall{Type: loadedRoles, Err: err}
} }
return loadedRoles, nil return loadedRoles, nil
} }
......
package rbac package rbac
import ( import (
"reflect"
"code.fbi.h-da.de/danet/gosdn/controller/interfaces/rbac" "code.fbi.h-da.de/danet/gosdn/controller/interfaces/rbac"
"code.fbi.h-da.de/danet/gosdn/controller/nucleus/database" "code.fbi.h-da.de/danet/gosdn/controller/nucleus/database"
"code.fbi.h-da.de/danet/gosdn/controller/nucleus/errors" "code.fbi.h-da.de/danet/gosdn/controller/nucleus/errors"
...@@ -95,7 +93,7 @@ func (s *DatabaseUserStore) getByID(idOfUser uuid.UUID) (rbac.LoadedUser, error) ...@@ -95,7 +93,7 @@ func (s *DatabaseUserStore) getByID(idOfUser uuid.UUID) (rbac.LoadedUser, error)
err := result.Decode(&loadedUser) err := result.Decode(&loadedUser)
if err != nil { if err != nil {
log.Printf("Failed marshalling %v", err) log.Printf("Failed marshalling %v", err)
return loadedUser, errors.ErrCouldNotMarshall{Identifier: idOfUser, Type: reflect.TypeOf(loadedUser), Err: err} return loadedUser, errors.ErrCouldNotMarshall{Identifier: idOfUser, Type: loadedUser, Err: err}
} }
return loadedUser, nil return loadedUser, nil
...@@ -118,7 +116,7 @@ func (s *DatabaseUserStore) getByName(nameOfUser string) (rbac.LoadedUser, error ...@@ -118,7 +116,7 @@ func (s *DatabaseUserStore) getByName(nameOfUser string) (rbac.LoadedUser, error
err := result.Decode(&loadedUser) err := result.Decode(&loadedUser)
if err != nil { if err != nil {
log.Printf("Failed marshalling %v", err) log.Printf("Failed marshalling %v", err)
return loadedUser, errors.ErrCouldNotMarshall{Identifier: nameOfUser, Type: reflect.TypeOf(loadedUser), Err: err} return loadedUser, errors.ErrCouldNotMarshall{Identifier: nameOfUser, Type: loadedUser, Err: err}
} }
return loadedUser, nil return loadedUser, nil
...@@ -144,7 +142,7 @@ func (s *DatabaseUserStore) GetAll() ([]rbac.LoadedUser, error) { ...@@ -144,7 +142,7 @@ func (s *DatabaseUserStore) GetAll() ([]rbac.LoadedUser, error) {
if err != nil { if err != nil {
log.Printf("Failed marshalling %v", err) log.Printf("Failed marshalling %v", err)
return nil, errors.ErrCouldNotMarshall{Type: reflect.TypeOf(loadedUsers), Err: err} return nil, errors.ErrCouldNotMarshall{Type: loadedUsers, Err: err}
} }
return loadedUsers, nil return loadedUsers, nil
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment