From 331c1722af54c16af638bb204d5111846c6ecba2 Mon Sep 17 00:00:00 2001 From: Levente Batuska Date: Tue, 15 Oct 2024 13:12:53 +0200 Subject: [PATCH 1/4] refactor(Type)!: harmonize naming 1 --- {typeutils => type}/interfaces.go | 2 +- {typeutils => type}/optional.go | 2 +- {typeutils => type}/result.go | 2 +- {typeutils => type}/types.go | 2 +- {typeutils => type}/utils.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename {typeutils => type}/interfaces.go (98%) rename {typeutils => type}/optional.go (99%) rename {typeutils => type}/result.go (99%) rename {typeutils => type}/types.go (86%) rename {typeutils => type}/utils.go (97%) diff --git a/typeutils/interfaces.go b/type/interfaces.go similarity index 98% rename from typeutils/interfaces.go rename to type/interfaces.go index 65460c5..f33962e 100644 --- a/typeutils/interfaces.go +++ b/type/interfaces.go @@ -1,4 +1,4 @@ -package typeutils +package Type // Created to abstract over Is_some and Is_ok type ValueContainer interface { diff --git a/typeutils/optional.go b/type/optional.go similarity index 99% rename from typeutils/optional.go rename to type/optional.go index 782cbb1..f8f0f89 100644 --- a/typeutils/optional.go +++ b/type/optional.go @@ -1,4 +1,4 @@ -package typeutils +package Type import "github.com/lbatuska/goutils/assert" diff --git a/typeutils/result.go b/type/result.go similarity index 99% rename from typeutils/result.go rename to type/result.go index 3af51d9..115ef32 100644 --- a/typeutils/result.go +++ b/type/result.go @@ -1,4 +1,4 @@ -package typeutils +package Type import ( "errors" diff --git a/typeutils/types.go b/type/types.go similarity index 86% rename from typeutils/types.go rename to type/types.go index 9dfde38..9284d16 100644 --- a/typeutils/types.go +++ b/type/types.go @@ -1,4 +1,4 @@ -package typeutils +package Type type Optional[T any] struct { value T diff --git a/typeutils/utils.go b/type/utils.go similarity index 97% rename from typeutils/utils.go rename to type/utils.go index 6cc0fcb..9f0ac61 100644 --- a/typeutils/utils.go +++ b/type/utils.go @@ -1,4 +1,4 @@ -package typeutils +package Type func Expect[T any](val Unwrappable[T], msg string) T { return val.Expect(msg) -- 2.49.1 From 86c8376f54955d8a3ad346ddde713a568331c08c Mon Sep 17 00:00:00 2001 From: Levente Batuska Date: Tue, 15 Oct 2024 13:26:44 +0200 Subject: [PATCH 2/4] refactor(Assert)!: harmonize naming 2 --- assert/assert.go | 2 +- type/optional.go | 6 +++--- type/result.go | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assert/assert.go b/assert/assert.go index 3192165..243d77a 100644 --- a/assert/assert.go +++ b/assert/assert.go @@ -1,4 +1,4 @@ -package assert +package Assert import ( "fmt" diff --git a/type/optional.go b/type/optional.go index f8f0f89..afc6d46 100644 --- a/type/optional.go +++ b/type/optional.go @@ -1,6 +1,6 @@ package Type -import "github.com/lbatuska/goutils/assert" +import Assert "github.com/lbatuska/goutils/assert" // CTORS BEGIN func Some[T any](value T) Optional[T] { @@ -41,7 +41,7 @@ func (opt *Optional[T]) HasValue() bool { // UNWRAPPABLE INTERFACE BEGIN func (opt *Optional[T]) Expect(msg string) T { - assert.NotNil(opt) + Assert.NotNil(opt) if opt.present { return opt.value } @@ -49,7 +49,7 @@ func (opt *Optional[T]) Expect(msg string) T { } func (opt *Optional[T]) Unwrap() T { - assert.NotNil(opt) + Assert.NotNil(opt) if opt.present { return opt.value } diff --git a/type/result.go b/type/result.go index 115ef32..71acae3 100644 --- a/type/result.go +++ b/type/result.go @@ -3,7 +3,7 @@ package Type import ( "errors" - "github.com/lbatuska/goutils/assert" + Assert "github.com/lbatuska/goutils/assert" ) // CTORS BEGIN @@ -44,7 +44,7 @@ func (res *Result[T]) HasValue() bool { // UNWRAPPABLE INTERFACE func (res *Result[T]) Expect(msg string) T { - assert.NotNil(res) + Assert.NotNil(res) if res.err == nil { return res.value } @@ -52,7 +52,7 @@ func (res *Result[T]) Expect(msg string) T { } func (res *Result[T]) Unwrap() T { - assert.NotNil(res) + Assert.NotNil(res) if res.err == nil { return res.value } -- 2.49.1 From b40f5885372dffee5c8bd84764cdad110aef04e1 Mon Sep 17 00:00:00 2001 From: Levente Batuska Date: Tue, 15 Oct 2024 13:27:15 +0200 Subject: [PATCH 3/4] refactor(Testing)!: harmonize naming 3 --- testing/testing.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/testing.go b/testing/testing.go index 2662f4c..4fad544 100644 --- a/testing/testing.go +++ b/testing/testing.go @@ -1,4 +1,4 @@ -package testing +package Testing import "testing" -- 2.49.1 From aacb529fb65d780f618b78ded67c719c963ff233 Mon Sep 17 00:00:00 2001 From: Levente Batuska Date: Tue, 15 Oct 2024 13:31:00 +0200 Subject: [PATCH 4/4] refactor(Logger)!: harmonize naming 4 --- logger/{ConsoleLogger.go => consolelogger.go} | 2 +- logger/{FileLogger.go => filelogger.go} | 2 +- logger/interfaces.go | 2 +- logger/{Logger.go => logger.go} | 2 +- logger/{NullLogger.go => nulllogger.go} | 2 +- logger/types.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename logger/{ConsoleLogger.go => consolelogger.go} (99%) rename logger/{FileLogger.go => filelogger.go} (99%) rename logger/{Logger.go => logger.go} (98%) rename logger/{NullLogger.go => nulllogger.go} (98%) diff --git a/logger/ConsoleLogger.go b/logger/consolelogger.go similarity index 99% rename from logger/ConsoleLogger.go rename to logger/consolelogger.go index 59f48a2..bcaeec6 100644 --- a/logger/ConsoleLogger.go +++ b/logger/consolelogger.go @@ -1,4 +1,4 @@ -package logger +package Logger import ( "fmt" diff --git a/logger/FileLogger.go b/logger/filelogger.go similarity index 99% rename from logger/FileLogger.go rename to logger/filelogger.go index ea9e663..63b4b2b 100644 --- a/logger/FileLogger.go +++ b/logger/filelogger.go @@ -1,4 +1,4 @@ -package logger +package Logger import ( "fmt" diff --git a/logger/interfaces.go b/logger/interfaces.go index 63cfd98..4cdba60 100644 --- a/logger/interfaces.go +++ b/logger/interfaces.go @@ -1,4 +1,4 @@ -package logger +package Logger // Message format(s) // diff --git a/logger/Logger.go b/logger/logger.go similarity index 98% rename from logger/Logger.go rename to logger/logger.go index 797d4b6..65ebeb9 100644 --- a/logger/Logger.go +++ b/logger/logger.go @@ -1,4 +1,4 @@ -package logger +package Logger import ( "encoding/json" diff --git a/logger/NullLogger.go b/logger/nulllogger.go similarity index 98% rename from logger/NullLogger.go rename to logger/nulllogger.go index 8186055..720af23 100644 --- a/logger/NullLogger.go +++ b/logger/nulllogger.go @@ -1,4 +1,4 @@ -package logger +package Logger func (lgr *NullLoggerImpl) init() {} diff --git a/logger/types.go b/logger/types.go index d9460c9..ace5cfa 100644 --- a/logger/types.go +++ b/logger/types.go @@ -1,4 +1,4 @@ -package logger +package Logger import ( "os" -- 2.49.1