bug[TW26880]: Resolve resource leaks

Signed-off-by: Baily Roberts <[email protected]>

Author: roberts-jenkins

plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/orcs/rest/applic/ApiKeyEndpointTest.java

@@ -137,14 +137,14 @@ public void testKeyLifeCycle() {
          keyValue.length());
 
       // Check Use
-      Response branchesResponse = getRequestWithAuthorization("/orcs/branches", keyValue);
-      assertEquals("Call with API Key was not successful with status: " + branchesResponse.getStatus(),
-         Family.SUCCESSFUL, branchesResponse.getStatusInfo().getFamily());
-
+      try (Response branchesResponse = getRequestWithAuthorization("/orcs/branches", keyValue);) {
+         assertEquals("Call with API Key was not successful with status: " + branchesResponse.getStatus(),
+            Family.SUCCESSFUL, branchesResponse.getStatusInfo().getFamily());
+      }
       // Revoke
-      Response response = apiKeyEndpoint.revokeApiKey(Long.parseLong(uid));
-      assertEquals(Family.SUCCESSFUL, response.getStatusInfo().getFamily());
-
+      try (Response response = apiKeyEndpoint.revokeApiKey(Long.parseLong(uid));) {
+         assertEquals(Family.SUCCESSFUL, response.getStatusInfo().getFamily());
+      }
       // Check ApiKey is gone
       apiKeys = apiKeyEndpoint.getApiKeys().readEntity(apiKeyList);
 
@@ -163,11 +163,11 @@ public void testKeyExpiration() {
       String keyValue = uidAndValue.get("keyValue");
 
       // Check Use
-      Response branchesResponse = getRequestWithAuthorization("/orcs/branches", keyValue);
-      assertNotEquals(
-         "Call with with expired API Key was unexpectedly successful with status: " + branchesResponse.getStatus(),
-         Family.SUCCESSFUL, branchesResponse.getStatusInfo().getFamily());
-
+      try (Response branchesResponse = getRequestWithAuthorization("/orcs/branches", keyValue);) {
+         assertNotEquals(
+            "Call with with expired API Key was unexpectedly successful with status: " + branchesResponse.getStatus(),
+            Family.SUCCESSFUL, branchesResponse.getStatusInfo().getFamily());
+      }
       // Create Key With Same Day Expiration
       scopes = setKeyScopes(new int[] {2});
       keyToCreate = new ApiKey("Key 1", scopes, currentDateString, currentDateString, "");
@@ -176,19 +176,21 @@ public void testKeyExpiration() {
       keyValue = uidAndValue.get("keyValue");
 
       // Check Use
-      branchesResponse = getRequestWithAuthorization("/orcs/branches", keyValue);
-      assertEquals(
-         "API Key call with same day expiration unexpectedly failed with status: " + branchesResponse.getStatus(),
-         Family.SUCCESSFUL, branchesResponse.getStatusInfo().getFamily());
+      try (Response branchesResponse = getRequestWithAuthorization("/orcs/branches", keyValue);) {
+         assertEquals(
+            "API Key call with same day expiration unexpectedly failed with status: " + branchesResponse.getStatus(),
+            Family.SUCCESSFUL, branchesResponse.getStatusInfo().getFamily());
+      }
    }
 
    @Test
    public void testInvalidKey() {
       // Check Use
-      Response branchesResponse = getRequestWithAuthorization("/orcs/branches", "invalid");
-      assertNotEquals(
-         "Call with with expired API Key was unexpectedly successful with status: " + branchesResponse.getStatus(),
-         Family.SUCCESSFUL, branchesResponse.getStatusInfo().getFamily());
+      try (Response branchesResponse = getRequestWithAuthorization("/orcs/branches", "invalid");) {
+         assertNotEquals(
+            "Call with with expired API Key was unexpectedly successful with status: " + branchesResponse.getStatus(),
+            Family.SUCCESSFUL, branchesResponse.getStatusInfo().getFamily());
+      }
    }
 
    @Test

plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/orcs/rest/applic/TransactionEndpointTest.java

@@ -720,7 +720,9 @@ private void purge(TransactionToken transactionId) throws Exception {
    public void testPurgeUnusedBackingData() {
       JdbcClient client = AtsApiService.get().getJdbcService().getClient();
       int initialRowCount = client.fetch(0, "SELECT count(1) FROM osee_attribute");
-      transactionEndpoint.purgeUnusedBackingDataAndTransactions();
+      try (Response response = transactionEndpoint.purgeUnusedBackingDataAndTransactions();) {
+         //
+      }
       int afterRowCount = client.fetch(0, "SELECT count(1) FROM osee_attribute");
       Assert.assertNotEquals(initialRowCount, afterRowCount);
    }

plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/operations/reports/FeatureImpactStreamingOutput.java

@@ -181,35 +181,37 @@ public void write(OutputStream output) {
                   final var baselineDocMsWordPreviewRequestData =
                      new PublishingRequestData(FeatureImpactStreamingOutput.publishingTemplateRequest,
                         baselineDocRendererOptions, List.of(previewHeadArtifactIdentifier));
-                  final var workingDocStream = this.publishingOperations.msWordPreview(
-                     workingDocMsWordPreviewRequestData).getDataHandler().getInputStream();
-                  final var baselineDocStream = this.publishingOperations.msWordPreview(
-                     baselineDocMsWordPreviewRequestData).getDataHandler().getInputStream();
-                  workingDocStream.mark(0);
-                  boolean equal = IOUtils.contentEquals(workingDocStream, baselineDocStream);
-                  baselineDocStream.close();
-                  if (!equal) {
-                     PrintWriter docWriter = new PrintWriter(writer);
-                     workingDocStream.reset();
+                  try (final var workingDocStream = this.publishingOperations.msWordPreview(
+                     workingDocMsWordPreviewRequestData).getDataHandler().getInputStream();) {
+                     try (final var baselineDocStream = this.publishingOperations.msWordPreview(
+                        baselineDocMsWordPreviewRequestData).getDataHandler().getInputStream();) {
+                        workingDocStream.mark(0);
+                        boolean equal = IOUtils.contentEquals(workingDocStream, baselineDocStream);
+                        baselineDocStream.close();
+                        if (!equal) {
+                           PrintWriter docWriter = new PrintWriter(writer);
+                           workingDocStream.reset();
 
-                     zipOut.putNextEntry(new ZipEntry(viewEntry.getKey() + ".xml"));
-                     try {
-                        InputStreamReader reader = new InputStreamReader(workingDocStream, "UTF-8");
-                        BufferedReader br = new BufferedReader(reader);
-                        String l;
-                        while ((l = br.readLine()) != null) {
-                           docWriter.println(l);
+                           zipOut.putNextEntry(new ZipEntry(viewEntry.getKey() + ".xml"));
+                           try {
+                              InputStreamReader reader = new InputStreamReader(workingDocStream, "UTF-8");
+                              BufferedReader br = new BufferedReader(reader);
+                              String l;
+                              while ((l = br.readLine()) != null) {
+                                 docWriter.println(l);
+                              }
+                              docWriter.flush();
+                              br.close();
+                              reader.close();
+                              workingDocStream.close();
+                           } catch (IOException ex) {
+                              OseeCoreException.wrapAndThrow(ex);
+                           }
+                           zipOut.closeEntry();
+                        } else {
+                           workingDocStream.close();
                         }
-                        docWriter.flush();
-                        br.close();
-                        reader.close();
-                        workingDocStream.close();
-                     } catch (IOException ex) {
-                        OseeCoreException.wrapAndThrow(ex);
                      }
-                     zipOut.closeEntry();
-                  } else {
-                     workingDocStream.close();
                   }
                }
             }