From 05b30353294cfae31c7ea9c7c7da142c3f9352ba Mon Sep 17 00:00:00 2001
From: gjahn <gregor.jahn@bht-berlin.de>
Date: Fri, 8 Dec 2023 00:39:09 +0100
Subject: [PATCH] cosmetics: e.a. rename store.Show to store.List
* remove some spaces
* return item.Name() instead of map key
* re-order router log output
---
routing/routes.go | 8 ++++----
state/ephemeral.go | 6 +++---
state/persistent.go | 4 ++--
state/store.go | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/routing/routes.go b/routing/routes.go
index 2a27bef..b787c8d 100644
--- a/routing/routes.go
+++ b/routing/routes.go
@@ -205,15 +205,15 @@ func SetRoutes( router *f.App, config *configuration.Config, store state.Store,
router.Get( "/states", func( c *f.Ctx ) error {
- states, err := store.Show()
+ names, err := store.List()
if err != nil {
return c.SendStatus( http.StatusInternalServerError )
}
const pathPrefix string = "/state"
- paths := make ( []string, len( states ) )
- for i, state := range states {
- paths[ i ] = fmt.Sprintf( "%s/%s", pathPrefix, state )
+ paths := make( []string, len( names ) )
+ for i, name := range names {
+ paths[ i ] = fmt.Sprintf( "%s/%s", pathPrefix, name )
}
headers := c.GetReqHeaders()
diff --git a/state/ephemeral.go b/state/ephemeral.go
index dc04c38..c473937 100644
--- a/state/ephemeral.go
+++ b/state/ephemeral.go
@@ -64,15 +64,15 @@ func ( e *Ephemeral ) Fetch( name string ) ( *Item, error ) {
}
-func ( e *Ephemeral ) Show() ( []string, error ) {
+func ( e *Ephemeral ) List() ( []string, error ) {
if e.store == nil {
return nil, errors.New( "ephemeral storage not available" )
}
e.mux.Lock()
names := make( []string, 0, len( e.store ) )
- for k := range e.store {
- names = append( names, k )
+ for _, item := range e.store {
+ names = append( names, item.Name() )
}
e.mux.Unlock()
diff --git a/state/persistent.go b/state/persistent.go
index b005e42..1c85757 100644
--- a/state/persistent.go
+++ b/state/persistent.go
@@ -51,8 +51,8 @@ func ( e *Persistent ) Add( i Item ) error {
name := i.Name()
if err := e.client.HSet(
ctx, name,
- "data", i.Data(),
"mime", i.MimeType(),
+ "data", i.Data(),
).Err(); err != nil {
return err
}
@@ -89,7 +89,7 @@ func ( e *Persistent ) Fetch( name string ) ( *Item, error ) {
}
-func ( e *Persistent ) Show() ( []string, error ) {
+func ( e *Persistent ) List() ( []string, error ) {
ctx, cancel := context.WithTimeout( context.TODO(), e.timeout )
defer cancel()
diff --git a/state/store.go b/state/store.go
index ec39599..2af271e 100644
--- a/state/store.go
+++ b/state/store.go
@@ -6,7 +6,7 @@ type Store interface {
Add( i Item ) error
Remove( name string ) error
Fetch( name string ) ( *Item, error )
- Show() ( []string, error )
+ List() ( []string, error )
Disconnect() error
}
--
GitLab