#86: moved TemplateResponse to LegacyConversationWebservice; other mi…

…nor changes

application/src/main/java/io/redlink/smarti/webservice/ConversationWebservice.java

@@ -530,7 +530,6 @@ public ResponseEntity<Template> getTemplate(
         // TODO: check Authentication / clientId
         final Client client = null;
 
-        // TODO(westei): Check if conversation needs to be re-analyzed/processed
         final Conversation conversation = conversationService.getConversation(conversationId);
         if (conversation == null) {
             return ResponseEntity.notFound().build();
@@ -583,9 +582,6 @@ public ResponseEntity<? extends SearchResult<? extends Result>> getResults(
             return ResponseEntity.badRequest().build();
         }
 
-        // TODO(westei): Check if conversation needs to be re-analyzed/processed
-
-
         final List<Template> templates = getAnalysis(client, conversation).getTemplates();
         final Template template;
 

application/src/main/java/io/redlink/smarti/webservice/LegacyConversationWebservice.java

@@ -28,6 +28,8 @@
 import io.redlink.smarti.webservice.pojo.QueryUpdate;
 import io.redlink.smarti.webservice.pojo.TemplateResponse;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
@@ -41,6 +43,8 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -271,4 +275,42 @@ public ResponseEntity<?> complete(@PathVariable("id") ObjectId id) {
             return ResponseEntity.ok(conversationService.completeConversation(conversation));
         }
     }
+
+    /**
+     */
+    @ApiModel
+    public static class TemplateResponse {
+
+        @ApiModelProperty(value = "Tokens extracted")
+        private List<Token> tokens = new ArrayList<>();
+
+        @ApiModelProperty(value = "Templates for possible queries")
+        private List<Template> templates = new ArrayList<>();
+
+        public List<Token> getTokens() {
+            return tokens;
+        }
+
+        public void setTokens(List<Token> tokens) {
+            this.tokens = tokens;
+        }
+
+        public List<Template> getTemplates() {
+            return templates;
+        }
+
+        public void setTemplates(List<Template> templates) {
+            this.templates = templates;
+        }
+
+        public static TemplateResponse from(Conversation conversation) {
+            final TemplateResponse response = new TemplateResponse();
+
+            response.tokens = conversation.getTokens();
+            response.templates = conversation.getTemplates();
+
+
+            return response;
+        }
+    }
 }