Merge branch 'index-manifest-after' into 'master'

Manifest indexed during check not extract

Closes #17

See merge request !10

src/main/java/uk/org/llgc/annotation/store/Check.java

@@ -357,6 +357,9 @@ public class Check extends HttpServlet {
 				_store.addAnnotationList(tAnnotationListJSON);
 				_logger.debug("Imported annotation list:");
 
+				indexManifest(key);
+				_logger.debug("Indexed manifest:");
+
 				annotationStatus = "Automatic annotations uploaded (" + tAnnotationListJSON.size() + ")";
 
 			} catch (Exception tException) {
@@ -368,6 +371,34 @@ public class Check extends HttpServlet {
 		return resp_part1 + resp_part2 + getExtractResultOk(jobId, status, annotationStatus)  + resp_part3;
 	}
 
+	private void indexManifest(String manifestUrl) throws IOException {
+		ServletContext context = getServletContext();
+
+		try {
+			// use direct localhost as https/ssl cannot be validated without creating keystore
+			// TODO : use constants or build using servelt configuration
+			String url = "http://127.0.0.1:8080/manifests";
+
+			String result = "";
+			HttpPost post = new HttpPost(url);
+
+			// add request parameters or form parameters
+			String TEXT_STRING="uri=" + manifestUrl ;
+			HttpEntity stringEntity = new StringEntity(TEXT_STRING, ContentType.APPLICATION_FORM_URLENCODED);
+			post.setEntity(stringEntity);
+
+			try (CloseableHttpClient httpClient = HttpClients.createDefault();
+				 CloseableHttpResponse response = httpClient.execute(post)) {
+				result = EntityUtils.toString(response.getEntity());
+			}
+
+			return;
+		} catch (Exception error) {
+			error.printStackTrace();
+		}
+	}
+
+
 	String buildResponseError(String errorCpde) {
 		return resp_part1 + resp_part2 + getExtractResultError(errorCpde) + resp_part3;
 	}

src/main/java/uk/org/llgc/annotation/store/Extract.java

@@ -57,7 +57,8 @@ public class Extract extends HttpServlet {
 				String result = "";
 				HttpPost post = new HttpPost(url);
 
-				indexManifest(pReq.getParameter("uri"));
+                // XXX this is now done in Check
+				// indexManifest(pReq.getParameter("uri"));
 
 				// add request parameters or form parameters
 				String JSON_STRING="{\"manifestUrls\":[\"" + pReq.getParameter("uri") + "\"]}";