From ec03ebaa5c3fa54dc3677df66fd487f9afb50a69 Mon Sep 17 00:00:00 2001
From: Christina <christina@84codes.com>
Date: Wed, 27 Nov 2024 11:18:54 +0100
Subject: [PATCH] adapt cache and handlers

---
 src/lavinmq/amqp/connection_factory.cr        | 4 ++--
 src/lavinmq/{cache.cr => auth/auth_cache.cr}  | 0
 src/lavinmq/auth/{ => handlers}/basic_auth.cr | 4 ++--
 src/lavinmq/auth/{ => handlers}/http_auth.cr  | 0
 src/lavinmq/auth/{ => handlers}/oauth2.cr     | 2 ++
 src/lavinmq/server.cr                         | 1 -
 6 files changed, 6 insertions(+), 5 deletions(-)
 rename src/lavinmq/{cache.cr => auth/auth_cache.cr} (100%)
 rename src/lavinmq/auth/{ => handlers}/basic_auth.cr (94%)
 rename src/lavinmq/auth/{ => handlers}/http_auth.cr (100%)
 rename src/lavinmq/auth/{ => handlers}/oauth2.cr (94%)

diff --git a/src/lavinmq/amqp/connection_factory.cr b/src/lavinmq/amqp/connection_factory.cr
index 043bb7e8d8..fcf8e2023e 100644
--- a/src/lavinmq/amqp/connection_factory.cr
+++ b/src/lavinmq/amqp/connection_factory.cr
@@ -2,8 +2,8 @@ require "../version"
 require "../logger"
 require "./client"
 require "../client/connection_factory"
-require "../auth/basic_auth"
-require "../auth/oauth2"
+require "../auth/handlers/basic_auth"
+require "../auth/handlers/oauth2"
 
 module LavinMQ
   module AMQP
diff --git a/src/lavinmq/cache.cr b/src/lavinmq/auth/auth_cache.cr
similarity index 100%
rename from src/lavinmq/cache.cr
rename to src/lavinmq/auth/auth_cache.cr
diff --git a/src/lavinmq/auth/basic_auth.cr b/src/lavinmq/auth/handlers/basic_auth.cr
similarity index 94%
rename from src/lavinmq/auth/basic_auth.cr
rename to src/lavinmq/auth/handlers/basic_auth.cr
index f5d193c997..e6cacad5aa 100644
--- a/src/lavinmq/auth/basic_auth.cr
+++ b/src/lavinmq/auth/handlers/basic_auth.cr
@@ -1,5 +1,5 @@
-require "./auth_handler"
-require "../server"
+require "../auth_handler"
+require "../../server"
 
 module LavinMQ
   class BasicAuthHandler < LavinMQ::AuthHandler
diff --git a/src/lavinmq/auth/http_auth.cr b/src/lavinmq/auth/handlers/http_auth.cr
similarity index 100%
rename from src/lavinmq/auth/http_auth.cr
rename to src/lavinmq/auth/handlers/http_auth.cr
diff --git a/src/lavinmq/auth/oauth2.cr b/src/lavinmq/auth/handlers/oauth2.cr
similarity index 94%
rename from src/lavinmq/auth/oauth2.cr
rename to src/lavinmq/auth/handlers/oauth2.cr
index 85da614710..d9d00e0570 100644
--- a/src/lavinmq/auth/oauth2.cr
+++ b/src/lavinmq/auth/handlers/oauth2.cr
@@ -1,3 +1,5 @@
+require "../auth_handler"
+
 module LavinMQ
   class OAuth2Handler < LavinMQ::AuthHandler
     def authenticate(username : String, password : String)
diff --git a/src/lavinmq/server.cr b/src/lavinmq/server.cr
index 30aa18aeae..832bd7a4f5 100644
--- a/src/lavinmq/server.cr
+++ b/src/lavinmq/server.cr
@@ -10,7 +10,6 @@ require "./exchange"
 require "./amqp/queue"
 require "./parameter"
 require "./config"
-require "./cache"
 require "./connection_info"
 require "./proxy_protocol"
 require "./client/client"