changed publishing to OSTI to send raw JSON metadata rather than

translated version
Signed-off-by: Neal Ensor <[email protected]>

Author: nensor

src/main/java/gov/osti/services/Metadata.java

@@ -1495,16 +1495,12 @@ public Response approve(@PathParam("codeId") Long codeId) {
 
             // if approving announced, send this to OSTI
             if (DOECodeMetadata.Status.Announced.equals(md.getWorkflowStatus())) {
-
-                OstiMetadata omd = new OstiMetadata();
-                omd.set(md);
-
                 // if configured, post this to OSTI
                 String publishing_host = context.getInitParameter("publishing.host");
                 if (null!=publishing_host) {
                     // set some reasonable default timeouts
                     // create an HTTP client to request through
-                    CloseableHttpClient hc =
+                    try (CloseableHttpClient hc =
                             HttpClientBuilder
                             .create()
                             .setDefaultRequestConfig(RequestConfig
@@ -1513,22 +1509,19 @@ public Response approve(@PathParam("codeId") Long codeId) {
                                     .setConnectTimeout(5000)
                                     .setConnectionRequestTimeout(5000)
                                     .build())
-                            .build();
+                            .build()) {
                     HttpPost post = new HttpPost(publishing_host + "/services/softwarecenter?action=api");
                     post.setHeader("Content-Type", "application/json");
                     post.setHeader("Accept", "application/json");
-                    post.setEntity(new StringEntity(omd.toJsonString(), "UTF-8"));
+                    post.setEntity(new StringEntity(mapper.writeValueAsString(md), "UTF-8"));
 
-                    try {
                         HttpResponse response = hc.execute(post);
                         String text = EntityUtils.toString(response.getEntity());
 
                         if ( HttpStatus.SC_OK!=response.getStatusLine().getStatusCode()) {
                             log.warn("OSTI Error: " + text);
                             throw new IOException ("OSTI software publication error");
                         }
-                    } finally {
-                        hc.close();
                     }
                 }
             }