Рефакторинг классов Middleware, LocalisationMiddleware и LoginMiddleware: изменен метод preHandle для использования исключений для остановки цепочки middleware и маршрутизации. Обновлены пакеты для соответствия новой структуре.

Author: AlexanderBazarov

…n/midlewares/LocalisationMiddleware.java …localisation/LocalisationMiddleware.javasrc/main/java/ru/untitled_devs/bot/features/localisation/midlewares/LocalisationMiddleware.java renamed to src/main/java/ru/untitled_devs/bot/features/localisation/LocalisationMiddleware.java src/main/java/ru/untitled_devs/bot/features/localisation/midlewares/LocalisationMiddleware.java renamed to src/main/java/ru/untitled_devs/bot/features/localisation/LocalisationMiddleware.java

@@ -1,7 +1,6 @@
-package ru.untitled_devs.bot.features.localisation.midlewares;
+package ru.untitled_devs.bot.features.localisation;
 
 import org.telegram.telegrambots.meta.api.objects.Update;
-import ru.untitled_devs.bot.features.localisation.LocalisationStates;
 import ru.untitled_devs.core.context.UpdateContext;
 import ru.untitled_devs.core.fsm.context.DataKey;
 import ru.untitled_devs.core.fsm.context.FSMContext;
@@ -12,19 +11,19 @@
 
 import java.util.Locale;
 
-public class LocalisationMiddleware implements Middleware {
+public class LocalisationMiddleware extends Middleware {
 	private final SceneManager sceneManager;
 	public LocalisationMiddleware(SceneManager sceneManager) {
 		this.sceneManager = sceneManager;
 	}
 
 	@Override
-	public boolean preHandle(UpdateContext update, FSMContext ctx) {
+	public void preHandle(UpdateContext update, FSMContext ctx) {
 		DataKey<Locale> langKey = DataKey.of("lang", Locale.class);
 		Locale loc = ctx.getData(langKey);
 
 		if (StatesGroup.contains(LocalisationStates.class, ctx.getState()))
-			return false;
+			stopMiddlewareChain();
 
 		if (loc == null) {
 			DataKey<Update> updateKey = DataKey.of("register:Update", Update.class);
@@ -34,9 +33,8 @@ public boolean preHandle(UpdateContext update, FSMContext ctx) {
 			ctx.setData(stateKey, ctx.getState());
 
 			sceneManager.enterScene("lang", update.getChatId(), ctx);
-			return false;
+			stopMiddlewareChain();
 		}
 
-		return true;
 	}
 }

…tration/middlewares/LoginMiddleware.java …atures/registration/LoginMiddleware.javasrc/main/java/ru/untitled_devs/bot/features/registration/middlewares/LoginMiddleware.java renamed to src/main/java/ru/untitled_devs/bot/features/registration/LoginMiddleware.java src/main/java/ru/untitled_devs/bot/features/registration/middlewares/LoginMiddleware.java renamed to src/main/java/ru/untitled_devs/bot/features/registration/LoginMiddleware.java

@@ -1,27 +1,25 @@
-package ru.untitled_devs.bot.features.registration.middlewares;
+package ru.untitled_devs.bot.features.registration;
 
-import ru.untitled_devs.bot.features.registration.RegistrationStates;
 import ru.untitled_devs.core.context.UpdateContext;
 import ru.untitled_devs.core.fsm.context.FSMContext;
 import ru.untitled_devs.core.fsm.states.State;
 import ru.untitled_devs.core.fsm.states.StatesGroup;
 import ru.untitled_devs.core.middlewares.Middleware;
 import ru.untitled_devs.core.routers.scenes.SceneManager;
 
-public class LoginMiddleware implements Middleware {
+public class LoginMiddleware extends Middleware {
 	private final SceneManager sceneManager;
 
 	public LoginMiddleware(SceneManager sceneManager) {
 		this.sceneManager = sceneManager;
 	}
 
 	@Override
-	public boolean preHandle(UpdateContext update, FSMContext ctx) {
+	public void preHandle(UpdateContext update, FSMContext ctx) {
 		State state = ctx.getState();
 		if (! StatesGroup.contains(RegistrationStates.class, state)) {
 			sceneManager.enterScene("register", update.getChatId(), ctx);
-			return false;
+			stopRouting();
 		}
-		return true;
 	}
 }

src/main/java/ru/untitled_devs/core/middlewares/Middleware.java

@@ -2,8 +2,18 @@
 
 import org.telegram.telegrambots.meta.api.objects.Update;
 import ru.untitled_devs.core.context.UpdateContext;
+import ru.untitled_devs.core.exceptions.StopMiddlewareException;
+import ru.untitled_devs.core.exceptions.StopRoutingException;
 import ru.untitled_devs.core.fsm.context.FSMContext;
 
-public interface Middleware {
-    boolean preHandle(UpdateContext update, FSMContext ctx);
+public abstract class Middleware {
+    public abstract void preHandle(UpdateContext update, FSMContext ctx);
+
+	protected void stopMiddlewareChain() {
+		throw new StopMiddlewareException();
+	}
+
+	protected void stopRouting() {
+		throw new StopRoutingException();
+	}
 }