From 8df3a2f075aafe17306bef68dabf10fb3854bc17 Mon Sep 17 00:00:00 2001
From: Rupert Westenthaler <rupert.westenthaler@gmail.com>
Date: Thu, 30 Nov 2017 15:51:07 +0100
Subject: [PATCH] #86: moved TemplateResponse to LegacyConversationWebservice;
 other minor changes

---
 .../webservice/ConversationWebservice.java    |  4 --
 .../LegacyConversationWebservice.java         | 42 ++++++++++++
 .../webservice/pojo/TemplateResponse.java     | 64 -------------------
 3 files changed, 42 insertions(+), 68 deletions(-)
 delete mode 100644 application/src/main/java/io/redlink/smarti/webservice/pojo/TemplateResponse.java

diff --git a/application/src/main/java/io/redlink/smarti/webservice/ConversationWebservice.java b/application/src/main/java/io/redlink/smarti/webservice/ConversationWebservice.java
index 46693569..ecf44bf1 100644
--- a/application/src/main/java/io/redlink/smarti/webservice/ConversationWebservice.java
+++ b/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;
         
diff --git a/application/src/main/java/io/redlink/smarti/webservice/LegacyConversationWebservice.java b/application/src/main/java/io/redlink/smarti/webservice/LegacyConversationWebservice.java
index 361b4ce1..6a33b8c2 100644
--- a/application/src/main/java/io/redlink/smarti/webservice/LegacyConversationWebservice.java
+++ b/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;
+        }
+    }
 }
diff --git a/application/src/main/java/io/redlink/smarti/webservice/pojo/TemplateResponse.java b/application/src/main/java/io/redlink/smarti/webservice/pojo/TemplateResponse.java
deleted file mode 100644
index 2db4b98b..00000000
--- a/application/src/main/java/io/redlink/smarti/webservice/pojo/TemplateResponse.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2017 Redlink GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package io.redlink.smarti.webservice.pojo;
-
-import io.redlink.smarti.model.Conversation;
-import io.redlink.smarti.model.Template;
-import io.redlink.smarti.model.Token;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- */
-@ApiModel
-public 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;
-    }
-}