From 45c20ff2e44c0439de008030ab25e77f178a3b15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Sterba?= <hda@andre-sterba.de>
Date: Fri, 6 Oct 2023 07:57:19 +0200
Subject: [PATCH] Remove interfaces folder and migrate legacy storables
---
.../store/store.go => nucleus/domain/ports/legacy.go} | 2 +-
controller/store/oldGenericStore.go | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
rename controller/{interfaces/store/store.go => nucleus/domain/ports/legacy.go} (96%)
diff --git a/controller/interfaces/store/store.go b/controller/nucleus/domain/ports/legacy.go
similarity index 96%
rename from controller/interfaces/store/store.go
rename to controller/nucleus/domain/ports/legacy.go
index 7d4d4a6a7..33b104be6 100644
--- a/controller/interfaces/store/store.go
+++ b/controller/nucleus/domain/ports/legacy.go
@@ -1,4 +1,4 @@
-package store
+package ports
import "github.com/google/uuid"
diff --git a/controller/store/oldGenericStore.go b/controller/store/oldGenericStore.go
index e5ac25eea..83b451076 100644
--- a/controller/store/oldGenericStore.go
+++ b/controller/store/oldGenericStore.go
@@ -5,7 +5,7 @@ import (
"sync"
"code.fbi.h-da.de/danet/gosdn/controller/customerrs"
- "code.fbi.h-da.de/danet/gosdn/controller/interfaces/store"
+ "code.fbi.h-da.de/danet/gosdn/controller/nucleus/domain/ports"
"github.com/google/uuid"
log "github.com/sirupsen/logrus"
@@ -13,11 +13,11 @@ import (
// newGenericStore returns a genericStore.
func newGenericStore() *genericStore {
- return &genericStore{Store: make(map[uuid.UUID]store.Storable), storeLock: sync.RWMutex{}}
+ return &genericStore{Store: make(map[uuid.UUID]ports.Storable), storeLock: sync.RWMutex{}}
}
type genericStore struct {
- Store map[uuid.UUID]store.Storable
+ Store map[uuid.UUID]ports.Storable
storeLock sync.RWMutex
}
@@ -30,7 +30,7 @@ func (s *genericStore) Exists(id uuid.UUID) bool {
}
// Add adds a Storable to the Store.
-func (s *genericStore) Add(item store.Storable) error {
+func (s *genericStore) Add(item ports.Storable) error {
if s.Exists(item.ID()) {
return &customerrs.AlreadyExistsError{Item: item}
}
@@ -48,7 +48,7 @@ func (s *genericStore) Add(item store.Storable) error {
// Storable does not exist an error is returned. Get is only type safe for
// this Storable interface. For type safe get operations on specialised stores
// use GetDevice, GetPND, GetSBI, or GetChange respectively.
-func (s *genericStore) Get(id uuid.UUID) (store.Storable, error) {
+func (s *genericStore) Get(id uuid.UUID) (ports.Storable, error) {
if !s.Exists(id) {
return nil, &customerrs.CouldNotFindError{ID: id}
}
--
GitLab