From 9260e98f013a0036ca8674ad692db87aaa1a2952 Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.b.seidl@stud.h-da.de>
Date: Tue, 14 Jun 2022 15:17:11 +0200
Subject: [PATCH] removed reflect call and used fmt formatting instead
---
controller/nucleus/databaseDeviceStore.go | 7 +++----
controller/nucleus/databasePndStore.go | 6 ++----
controller/nucleus/databaseSbiStore.go | 6 ++----
controller/nucleus/errors/errors.go | 2 +-
controller/rbac/databaseRoleStore.go | 8 +++-----
controller/rbac/databaseUserStore.go | 8 +++-----
6 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/controller/nucleus/databaseDeviceStore.go b/controller/nucleus/databaseDeviceStore.go
index dac31e643..0f30f475d 100644
--- a/controller/nucleus/databaseDeviceStore.go
+++ b/controller/nucleus/databaseDeviceStore.go
@@ -2,7 +2,6 @@ package nucleus
import (
"fmt"
- "reflect"
"code.fbi.h-da.de/danet/gosdn/controller/interfaces/device"
"code.fbi.h-da.de/danet/gosdn/controller/nucleus/database"
@@ -66,7 +65,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{Identifier: idOfDevice, Type: reflect.TypeOf(loadedDevice), Err: err}
+ return loadedDevice, errors.ErrCouldNotMarshall{Identifier: idOfDevice, Type: loadedDevice, Err: err}
}
return loadedDevice, nil
@@ -89,7 +88,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{Identifier: nameOfDevice, Type: reflect.TypeOf(loadedDevice), Err: err}
+ return loadedDevice, errors.ErrCouldNotMarshall{Identifier: nameOfDevice, Type: loadedDevice, Err: err}
}
return loadedDevice, nil
@@ -115,7 +114,7 @@ func (s *DatabaseDeviceStore) GetAll() ([]device.LoadedDevice, error) {
if err != nil {
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
diff --git a/controller/nucleus/databasePndStore.go b/controller/nucleus/databasePndStore.go
index fd5050843..66b330290 100644
--- a/controller/nucleus/databasePndStore.go
+++ b/controller/nucleus/databasePndStore.go
@@ -1,8 +1,6 @@
package nucleus
import (
- "reflect"
-
"code.fbi.h-da.de/danet/gosdn/controller/interfaces/device"
"code.fbi.h-da.de/danet/gosdn/controller/interfaces/networkdomain"
@@ -46,7 +44,7 @@ func (s *DatabasePndStore) Get(query store.Query) (networkdomain.NetworkDomain,
if err != nil {
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()
@@ -89,7 +87,7 @@ func (s *DatabasePndStore) GetAll() ([]networkdomain.NetworkDomain, error) {
if err != nil {
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()
diff --git a/controller/nucleus/databaseSbiStore.go b/controller/nucleus/databaseSbiStore.go
index 5ed594fcb..446d1847b 100644
--- a/controller/nucleus/databaseSbiStore.go
+++ b/controller/nucleus/databaseSbiStore.go
@@ -1,8 +1,6 @@
package nucleus
import (
- "reflect"
-
"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/errors"
@@ -77,7 +75,7 @@ func (s *DatabaseSbiStore) Get(query store.Query) (southbound.LoadedSbi, error)
if err != nil {
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
@@ -103,7 +101,7 @@ func (s *DatabaseSbiStore) GetAll() ([]southbound.LoadedSbi, error) {
if err != nil {
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
diff --git a/controller/nucleus/errors/errors.go b/controller/nucleus/errors/errors.go
index ddc562044..863f09548 100644
--- a/controller/nucleus/errors/errors.go
+++ b/controller/nucleus/errors/errors.go
@@ -168,7 +168,7 @@ type ErrCouldNotMarshall struct {
}
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
diff --git a/controller/rbac/databaseRoleStore.go b/controller/rbac/databaseRoleStore.go
index 2c821a14e..93217638a 100644
--- a/controller/rbac/databaseRoleStore.go
+++ b/controller/rbac/databaseRoleStore.go
@@ -1,8 +1,6 @@
package rbac
import (
- "reflect"
-
"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/errors"
@@ -95,7 +93,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{Identifier: idOfRole, Type: reflect.TypeOf(loadedRole), Err: err}
+ return loadedRole, errors.ErrCouldNotMarshall{Identifier: idOfRole, Type: loadedRole, Err: err}
}
return loadedRole, nil
@@ -118,7 +116,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{Identifier: nameOfRole, Type: reflect.TypeOf(loadedRole), Err: err}
+ return loadedRole, errors.ErrCouldNotMarshall{Identifier: nameOfRole, Type: loadedRole, Err: err}
}
return loadedRole, nil
@@ -144,7 +142,7 @@ func (s *DatabaseRoleStore) GetAll() ([]rbac.LoadedRole, error) {
if err != nil {
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
}
diff --git a/controller/rbac/databaseUserStore.go b/controller/rbac/databaseUserStore.go
index f74676f76..531263334 100644
--- a/controller/rbac/databaseUserStore.go
+++ b/controller/rbac/databaseUserStore.go
@@ -1,8 +1,6 @@
package rbac
import (
- "reflect"
-
"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/errors"
@@ -95,7 +93,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{Identifier: idOfUser, Type: reflect.TypeOf(loadedUser), Err: err}
+ return loadedUser, errors.ErrCouldNotMarshall{Identifier: idOfUser, Type: loadedUser, Err: err}
}
return loadedUser, nil
@@ -118,7 +116,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{Identifier: nameOfUser, Type: reflect.TypeOf(loadedUser), Err: err}
+ return loadedUser, errors.ErrCouldNotMarshall{Identifier: nameOfUser, Type: loadedUser, Err: err}
}
return loadedUser, nil
@@ -144,7 +142,7 @@ func (s *DatabaseUserStore) GetAll() ([]rbac.LoadedUser, error) {
if err != nil {
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
}
--
GitLab