src/main/java/com/mediamanager/service/delegate/DelegateActionManager.java

@@ -3,58 +3,45 @@ package com.mediamanager.service.delegate;
 import com.google.protobuf.ByteString;
 import com.mediamanager.protocol.TransportProtocol;
 import com.mediamanager.repository.GenreRepository;
-import com.mediamanager.service.delegate.annotation.Action;
+import com.mediamanager.service.delegate.handler.CloseHandler;
-
+import com.mediamanager.service.delegate.handler.EchoHandler;
+import com.mediamanager.service.delegate.handler.HeartbeatHandler;
+import com.mediamanager.service.delegate.handler.genre.*;
 import com.mediamanager.service.genre.GenreService;
 import jakarta.persistence.EntityManagerFactory;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.reflections.Reflections;
-import org.reflections.scanners.Scanners;
-import java.lang.reflect.Constructor;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
 public class DelegateActionManager {
     private static final Logger logger = LogManager.getLogger(DelegateActionManager.class);
     
     private final Map<String, ActionHandler> handlerRegistry;
-    private final ServiceLocator serviceLocator;
     private final EntityManagerFactory entityManagerFactory;
-
+    private final GenreService genreService;
 
     public DelegateActionManager(EntityManagerFactory entityManagerFactory) {
         this.entityManagerFactory = entityManagerFactory;
-        this.serviceLocator = new ServiceLocator();
-
-        initializeServices();
-
-
-        logger.debug("DelegateActionManager created");
-        this.handlerRegistry = new HashMap<>();
-        autoRegisterHandlers();
-
-    }
-
-    private void initializeServices() {
-        logger.info("Initializing services...");
-
 
         GenreRepository genreRepository = new GenreRepository(entityManagerFactory);
-        GenreService genreService = new GenreService(genreRepository);
+        this.genreService = new GenreService(genreRepository);
-
+        logger.debug("DelegateActionManager created");
-
+        this.handlerRegistry = new HashMap<>();
-        serviceLocator.register(GenreService.class, genreService);
+        registerHandlers();
-
-
-        serviceLocator.logRegisteredServices();
-
-        logger.info("Services initialized successfully");
     }
 
-
+    private void registerHandlers() {
+        handlerRegistry.put("echo",new EchoHandler());
+        handlerRegistry.put("heartbeat",new HeartbeatHandler());
+        handlerRegistry.put("close", new CloseHandler());
+        handlerRegistry.put("create_genre", new CreateGenreHandler(genreService));
+        handlerRegistry.put("get_genres", new GetGenreHandler(genreService));
+        handlerRegistry.put("get_genre_by_id", new GetGenreByIdHandler(genreService));
+        handlerRegistry.put("update_genre", new UpdateGenreHandler(genreService));
+        handlerRegistry.put("delete_genre", new DeleteGenreHandler(genreService));
+    }
 
     public void start(){
         logger.info("DelegateActionManager started");
@@ -64,117 +51,6 @@ public class DelegateActionManager {
         logger.info("DelegateActionManager stopped");
     }
 
-    @SuppressWarnings("unchecked")
-    private ActionHandler instantiateHandler(Class<?> clazz) throws Exception {
-        if(!ActionHandler.class.isAssignableFrom(clazz)){
-            throw new IllegalArgumentException(
-                    clazz.getName() + " is annotated with @Action but does not implement ActionHandler");
-
-        }
-        logger.debug("Attempting to instantiate handler: {}", clazz.getSimpleName());
-
-
-        Constructor<?>[] constructors = clazz.getDeclaredConstructors();
-
-
-        // Sort constructors by parameter count (descending) to prefer DI constructors
-        java.util.Arrays.sort(constructors, (c1, c2) -> 
-            Integer.compare(c2.getParameterCount(), c1.getParameterCount()));
-
-        for (Constructor<?> constructor : constructors) {
-
-            Class<?>[] paramTypes = constructor.getParameterTypes();
-
-
-            Object[] params = new Object[paramTypes.length];
-            boolean allDependenciesResolved = true;
-
-            for (int i = 0; i < paramTypes.length; i++) {
-
-                Object service = serviceLocator.get(paramTypes[i]);
-
-                if (service == null) {
-
-                    allDependenciesResolved = false;
-                    logger.debug("Cannot resolve dependency {} for {}",
-                            paramTypes[i].getSimpleName(),
-                            clazz.getSimpleName());
-                    break;  // Para de tentar esse construtor
-                }
-
-
-                params[i] = service;
-            }
-
-
-            if (allDependenciesResolved) {
-                logger.debug("Using constructor with {} params for {}",
-                        paramTypes.length, clazz.getSimpleName());
-                return (ActionHandler) constructor.newInstance(params);
-            }
-        }
-
-
-        throw new IllegalStateException(
-                String.format(
-                        "Cannot instantiate handler %s. No suitable constructor found. " +
-                                "Make sure all required services are registered in ServiceLocator.",
-                        clazz.getName()
-                )
-        );
-    }
-
-    private void autoRegisterHandlers() {
-        logger.info("Starting auto-registration of handlers...");
-        Reflections reflections = new Reflections(
-                "com.mediamanager.service.delegate.handler",
-                Scanners.TypesAnnotated
-        );
-        Set<Class<?>> annotatedClasses = reflections.getTypesAnnotatedWith(Action.class);
-        logger.info("Found {} handler classes with @Action annotation", annotatedClasses.size());
-        int successCount = 0;
-        int failureCount = 0;
-        for (Class<?> handlerClass : annotatedClasses) {
-            try {
-
-                Action actionAnnotation = handlerClass.getAnnotation(Action.class);
-                String actionName = actionAnnotation.value();
-
-                logger.debug("Processing handler: {} for action '{}'",
-                        handlerClass.getSimpleName(),
-                        actionName);
-
-
-                ActionHandler handler = instantiateHandler(handlerClass);
-
-
-                handlerRegistry.put(actionName, handler);
-
-                logger.info("✓ Registered handler: '{}' -> {}",
-                        actionName,
-                        handlerClass.getSimpleName());
-                successCount++;
-
-            } catch (Exception e) {
-
-                logger.error("✗ Failed to register handler: {}",
-                        handlerClass.getName(),
-                        e);
-                failureCount++;
-            }
-        }
-
-
-        logger.info("Auto-registration complete: {} successful, {} failed, {} total",
-                successCount,
-                failureCount,
-                successCount + failureCount);
-
-        if (failureCount > 0) {
-            logger.warn("Some handlers failed to register. Check logs above for details.");
-        }
-    }
-
     public TransportProtocol.Response ProcessedRequest(TransportProtocol.Request request){
         String requestId = request.getRequestId();
         logger.info("Processing request: {}", requestId);

src/main/java/com/mediamanager/service/delegate/ServiceLocator.java

@@ -1,45 +0,0 @@
-package com.mediamanager.service.delegate;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class ServiceLocator {
-    private static final Logger logger = LogManager.getLogger(ServiceLocator.class);
-    private final Map<Class<?>, Object> services = new HashMap<>();
-
-    public <T> void register(Class<T> serviceClass, T serviceInstance) {
-        if (serviceInstance == null) {
-            throw new IllegalArgumentException("Service instance cannot be null");
-        }
-        services.put(serviceClass, serviceInstance);
-        logger.debug("Registered service: {} -> {}",
-                serviceClass.getSimpleName(),
-                serviceInstance.getClass().getSimpleName());
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> T get(Class<T> serviceClass) {
-        return (T) services.get(serviceClass);
-    }
-
-    public boolean has(Class<?> serviceClass) {
-        return services.containsKey(serviceClass);
-    }
-    public int size() {
-        return services.size();
-    }
-    public void logRegisteredServices() {
-        logger.info("Registered services: {}", services.size());
-
-
-        services.forEach((clazz, instance) ->
-                logger.info("  - {} -> {}",
-                        clazz.getSimpleName(),
-                        instance.getClass().getSimpleName())
-        );
-    }
-}
-

src/main/java/com/mediamanager/service/delegate/annotation/Action.java

@@ -1,13 +0,0 @@
-package com.mediamanager.service.delegate.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface Action {
-
-    String value();
-}

src/main/java/com/mediamanager/service/delegate/handler/CloseHandler.java

@@ -6,11 +6,9 @@ import com.mediamanager.protocol.TestProtocol.CloseCommand;
 import com.mediamanager.protocol.TestProtocol.CloseResponse;
 import com.mediamanager.protocol.TransportProtocol;
 import com.mediamanager.service.delegate.ActionHandler;
-import com.mediamanager.service.delegate.annotation.Action;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-@Action("close")
 public class CloseHandler implements ActionHandler {
     private static final Logger logger = LogManager.getLogger(CloseHandler.class);
 

src/main/java/com/mediamanager/service/delegate/handler/EchoHandler.java

@@ -6,11 +6,9 @@ import com.mediamanager.protocol.TestProtocol.EchoCommand;      // ← Import
 import com.mediamanager.protocol.TestProtocol.EchoResponse;    // ← Import
 import com.mediamanager.protocol.TransportProtocol;
 import com.mediamanager.service.delegate.ActionHandler;
-import com.mediamanager.service.delegate.annotation.Action;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-@Action("echo")
 public class EchoHandler implements ActionHandler {
     private static final Logger logger = LogManager.getLogger(EchoHandler.class);
 

src/main/java/com/mediamanager/service/delegate/handler/HeartbeatHandler.java

@@ -6,11 +6,9 @@ import com.mediamanager.protocol.TestProtocol.HeartbeatCommand;
 import com.mediamanager.protocol.TestProtocol.HeartbeatResponse;
 import com.mediamanager.protocol.TransportProtocol;
 import com.mediamanager.service.delegate.ActionHandler;
-import com.mediamanager.service.delegate.annotation.Action;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-@Action("heartbeat")
 public class HeartbeatHandler implements ActionHandler {
     private static final Logger logger = LogManager.getLogger(HeartbeatHandler.class);
 

src/main/java/com/mediamanager/service/delegate/handler/genre/CreateGenreHandler.java

@@ -7,12 +7,10 @@ import com.mediamanager.model.Genre;
 import com.mediamanager.protocol.TransportProtocol;
 import com.mediamanager.protocol.messages.GenreMessages;
 import com.mediamanager.service.delegate.ActionHandler;
-import com.mediamanager.service.delegate.annotation.Action;
 import com.mediamanager.service.genre.GenreService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-@Action("genre.create")
 public class CreateGenreHandler implements ActionHandler {
     private static final Logger logger = LogManager.getLogger(CreateGenreHandler.class);
 

src/main/java/com/mediamanager/service/delegate/handler/genre/DeleteGenreHandler.java

@@ -5,12 +5,10 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import com.mediamanager.protocol.TransportProtocol;
 import com.mediamanager.protocol.messages.GenreMessages;
 import com.mediamanager.service.delegate.ActionHandler;
-import com.mediamanager.service.delegate.annotation.Action;
 import com.mediamanager.service.genre.GenreService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-@Action("genre.delete")
 public class DeleteGenreHandler implements ActionHandler {
     private static final Logger logger = LogManager.getLogger(DeleteGenreHandler.class);
 

src/main/java/com/mediamanager/service/delegate/handler/genre/GetGenreByIdHandler.java

@@ -7,14 +7,12 @@ import com.mediamanager.model.Genre;
 import com.mediamanager.protocol.TransportProtocol;
 import com.mediamanager.protocol.messages.GenreMessages;
 import com.mediamanager.service.delegate.ActionHandler;
-import com.mediamanager.service.delegate.annotation.Action;
 import com.mediamanager.service.genre.GenreService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import java.util.Optional;
 
-@Action("genre.getById")
 public class GetGenreByIdHandler implements ActionHandler {
     private static final Logger logger = LogManager.getLogger(GetGenreByIdHandler.class);
 

src/main/java/com/mediamanager/service/delegate/handler/genre/GetGenreHandler.java

@@ -7,14 +7,12 @@ import com.mediamanager.model.Genre;
 import com.mediamanager.protocol.TransportProtocol;
 import com.mediamanager.protocol.messages.GenreMessages;
 import com.mediamanager.service.delegate.ActionHandler;
-import com.mediamanager.service.delegate.annotation.Action;
 import com.mediamanager.service.genre.GenreService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import java.util.List;
 
-@Action("genre.getAll")
 public class GetGenreHandler implements ActionHandler {
     private static final Logger logger = LogManager.getLogger(GetGenreHandler.class);
 

src/main/java/com/mediamanager/service/delegate/handler/genre/UpdateGenreHandler.java

@@ -7,14 +7,12 @@ import com.mediamanager.model.Genre;
 import com.mediamanager.protocol.TransportProtocol;
 import com.mediamanager.protocol.messages.GenreMessages;
 import com.mediamanager.service.delegate.ActionHandler;
-import com.mediamanager.service.delegate.annotation.Action;
 import com.mediamanager.service.genre.GenreService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import java.util.Optional;
 
-@Action("genre.update")
 public class UpdateGenreHandler implements ActionHandler {
     private static final Logger logger = LogManager.getLogger(UpdateGenreHandler.class);