summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2024-08-12 10:45:04 +0300
committerPaul Buetow <paul@buetow.org>2024-08-12 10:45:04 +0300
commit2fb3cfbe72170fb44a5056271f051806af09cc09 (patch)
tree926b240222be3451fae73ac90afd8f441612be3a
parentb79de37224b40374cd0bc17881b3677138c44935 (diff)
rename
-rw-r--r--internal/server/handler/handler.go5
-rw-r--r--internal/server/repository/repository.go4
-rw-r--r--internal/server/repository/repository_test.go2
-rw-r--r--internal/types/entry.go2
4 files changed, 7 insertions, 6 deletions
diff --git a/internal/server/handler/handler.go b/internal/server/handler/handler.go
index 25a4d12..46bf73e 100644
--- a/internal/server/handler/handler.go
+++ b/internal/server/handler/handler.go
@@ -67,11 +67,12 @@ func (h Handler) Get(w http.ResponseWriter, r *http.Request) error {
return fmt.Errorf("no entry with id %s found", id)
}
- jsonBytes, err := ent.Serialize()
+ bytes, err := ent.JSONBytes()
if err != nil {
return err
}
- fmt.Fprint(w, string(jsonBytes))
+
+ fmt.Fprint(w, string(bytes))
return nil
}
diff --git a/internal/server/repository/repository.go b/internal/server/repository/repository.go
index 3a598af..b9f6475 100644
--- a/internal/server/repository/repository.go
+++ b/internal/server/repository/repository.go
@@ -63,7 +63,7 @@ func (r Repository) put(ent types.Entry) error {
defer r.mu.Unlock()
r.entries[ent.ID] = ent
- bytes, err := ent.Serialize()
+ bytes, err := ent.JSONBytes()
if err != err {
return err
}
@@ -177,7 +177,7 @@ func (r Repository) Merge(otherEnt types.Entry) error {
return nil
}
- bytes, err := ent.Serialize()
+ bytes, err := ent.JSONBytes()
if err != err {
return err
}
diff --git a/internal/server/repository/repository_test.go b/internal/server/repository/repository_test.go
index 1a5262f..34342fa 100644
--- a/internal/server/repository/repository_test.go
+++ b/internal/server/repository/repository_test.go
@@ -37,7 +37,7 @@ func TestRepositoryLoad(t *testing.T) {
// Write entries into the VFS
for _, ent := range entries {
- bytes, _ := ent.Serialize()
+ bytes, _ := ent.JSONBytes()
_ = repo.fs.WriteFile(repo.entryPath(ent), bytes)
}
diff --git a/internal/types/entry.go b/internal/types/entry.go
index fd1e12a..73ef0d2 100644
--- a/internal/types/entry.go
+++ b/internal/types/entry.go
@@ -157,7 +157,7 @@ func (e Entry) Update(other Entry) (Entry, error) {
return e, nil
}
-func (e Entry) Serialize() ([]byte, error) {
+func (e Entry) JSONBytes() ([]byte, error) {
return json.Marshal(e)
}