Remove superfluous logging

[gpl/argeo-slc.git] / runtime / org.argeo.slc.server / src / main / java / org / argeo / slc / web / mvc / EventController.java

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/EventController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/EventController.java
index a245b08d38db2ce9ce758413b73371c5a7a056fb..50c532be34fc7746297e7604e064e8889a889b9e 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/EventController.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/EventController.java
@@ -8,7 +8,6 @@ import org.argeo.slc.msg.event.SlcEventListener;
 import org.argeo.slc.msg.event.SlcEventListenerDescriptor;\r
 import org.argeo.slc.msg.event.SlcEventListenerRegister;\r
 import org.springframework.stereotype.Controller;\r
-import org.springframework.ui.Model;\r
 import org.springframework.web.bind.annotation.RequestMapping;\r
 import org.springframework.web.bind.annotation.RequestParam;\r
 \r
@@ -25,16 +24,14 @@ public class EventController {
        private SlcEventListener eventListener = null;\r
 \r
        public EventController() {\r
-               if (log.isDebugEnabled())\r
-                       log.debug("In EventController Constructor");\r
        }\r
 \r
        // Business Methods\r
 \r
        @RequestMapping("/addEventListener.service")\r
-       public String addEventListener(\r
+       public ExecutionAnswer addEventListener(\r
                        @RequestParam(SlcEvent.EVENT_TYPE) String eventType,\r
-                       @RequestParam(value=SlcEvent.EVENT_FILTER, required=false) String eventFilter, Model model) {\r
+                       @RequestParam(value = SlcEvent.EVENT_FILTER, required = false) String eventFilter) {\r
 \r
                eventListenerRegister\r
                                .addEventListenerDescriptor(new SlcEventListenerDescriptor(\r
@@ -43,16 +40,14 @@ public class EventController {
                        log.trace("Registered listener on register "\r
                                        + eventListenerRegister.getId() + " for type " + eventType\r
                                        + ", filter=" + eventFilter);\r
-               model.addAttribute(KEY_ANSWER, ExecutionAnswer\r
-                               .ok("Execution completed properly"));\r
-               return KEY_ANSWER;\r
+               return ExecutionAnswer.ok("Execution completed properly");\r
 \r
        }\r
 \r
        @RequestMapping("/removeEventListener.service")\r
-       public String removeEventListener(\r
+       public ExecutionAnswer removeEventListener(\r
                        @RequestParam(SlcEvent.EVENT_TYPE) String eventType,\r
-                       @RequestParam(value=SlcEvent.EVENT_FILTER, required=false) String eventFilter, Model model) {\r
+                       @RequestParam(value = SlcEvent.EVENT_FILTER, required = false) String eventFilter) {\r
 \r
                eventListenerRegister\r
                                .removeEventListenerDescriptor(new SlcEventListenerDescriptor(\r
@@ -61,14 +56,12 @@ public class EventController {
                        log.trace("Removed listener from register "\r
                                        + eventListenerRegister.getId() + " for type " + eventType\r
                                        + ", filter=" + eventFilter);\r
-               model.addAttribute(KEY_ANSWER, ExecutionAnswer\r
-                               .ok("Execution completed properly"));\r
-               return KEY_ANSWER;\r
+               return ExecutionAnswer.ok("Execution completed properly");\r
        }\r
 \r
        @RequestMapping("/pollEvent.service")\r
-       public String pollEvent(@RequestParam("timeout") String timeoutStr,\r
-                       Model model) {\r
+       public Object pollEvent(\r
+                       @RequestParam(value = "timeout", required = false) String timeoutStr) {\r
                final Long timeout;\r
                if (timeoutStr != null)\r
                        timeout = Long.parseLong(timeoutStr);\r
@@ -78,14 +71,10 @@ public class EventController {
                SlcEvent event = eventListener.listen(eventListenerRegister.getId(),\r
                                eventListenerRegister.getDescriptorsCopy(), timeout);\r
                if (event != null) {\r
-                       model.addAttribute("event", event);\r
-                       if (log.isTraceEnabled())\r
-                               log.debug("Received event: "\r
-                                               + event.getHeaders().get(SlcEvent.EVENT_TYPE));\r
+                       return event;\r
+               } else {\r
+                       return ExecutionAnswer.ok("Execution completed properly");\r
                }\r
-               model.addAttribute(KEY_ANSWER, ExecutionAnswer\r
-                               .ok("Execution completed properly"));\r
-               return KEY_ANSWER;\r
        }\r
 \r
        public void setEventListenerRegister(\r