Bugfix - build retention service sends an empty body (#504)

Author: Or-Geva

Diff for: build-info-extractor/src/main/java/org/jfrog/build/extractor/clientConfiguration/client/artifactory/services/SendBuildRetention.java

@@ -2,6 +2,7 @@
 
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.entity.StringEntity;
 import org.jfrog.build.api.BuildRetention;
 import org.jfrog.build.api.util.Log;
 import org.jfrog.build.extractor.clientConfiguration.client.VoidJFrogService;
@@ -29,9 +30,14 @@ public SendBuildRetention(BuildRetention buildRetention, String buildName, Strin
     @Override
     public HttpRequestBase createRequest() throws IOException {
         log.info(createBuildRetentionLogMsg(buildRetention, async));
-        log.debug(toJsonString(buildRetention));
+        String buildRetentionString = toJsonString(buildRetention);
+        log.debug(buildRetentionString);
         String url = RETENTION_REST_URL + buildName + "?async=" + async + getProjectQueryParam(project, "&project=");
-        return new HttpPost(url);
+        StringEntity stringEntity = new StringEntity(buildRetentionString, "UTF-8");
+        stringEntity.setContentType("application/json");
+        HttpPost request = new HttpPost(url);
+        request.setEntity(stringEntity);
+        return request;
     }
 
     private String createBuildRetentionLogMsg(BuildRetention buildRetention, boolean async) {

Diff for: build-info-extractor/src/test/java/org/jfrog/build/extractor/clientConfiguration/client/ArtifactoryManagerTest.java

@@ -30,6 +30,8 @@
 public class ArtifactoryManagerTest extends IntegrationTestsBase {
     private static final String TEST_SPACE = "bi_client_test_space";
     private static final File tempWorkspace = new File(System.getProperty("java.io.tmpdir"), TEST_SPACE);
+    private static final String BUILD_NAME = "ArtifactoryManagerTest";
+    private static final String BUILD_NUMBER = "13";
 
     @BeforeMethod
     @AfterMethod
@@ -42,18 +44,18 @@ protected void cleanup() throws IOException {
      * Send build info to artifactory, receive it and compare.
      */
     @Test
-    public void sendBuildInfoTest() throws IOException {
+    public void sendBuildInfoAndBuildRetentioTest() throws IOException {
         doSendBuildInfoTest(null);
+        sendBuildRetention("");
     }
 
     @Test
     public void sendBuildInfoWithProjectTest() throws IOException {
         doSendBuildInfoTest("jit");
+        sendBuildRetention("jit");
     }
 
     private void doSendBuildInfoTest(String project) throws IOException {
-        final String BUILD_NAME = "ArtifactoryManagerTest";
-        final String BUILD_NUMBER = "13";
         final Date STARTED = new Date();
         final List<Vcs> VCS = Arrays.asList(new Vcs("foo", "1"),
                 new Vcs("bar", "2"),
@@ -95,4 +97,11 @@ private void doSendBuildInfoTest(String project) throws IOException {
         // Compare
         Assert.assertEquals(toJsonString(buildInfoToSend), toJsonString(receivedBuildInfo));
     }
+
+    private void sendBuildRetention(String project) throws IOException {
+        BuildRetention buildRetention = new BuildRetention();
+        buildRetention.setCount(1);
+        buildRetention.setDeleteBuildArtifacts(false);
+        artifactoryManager.sendBuildRetention(buildRetention, BUILD_NAME, project, false);
+    }
 }