From 70e11e6a094ffd3796a8d54d8b5d72cc4512d143 Mon Sep 17 00:00:00 2001
From: Matt Wringe <mwringe@redhat.com>
Date: Wed, 23 Sep 2015 11:57:36 -0400
Subject: [PATCH] HWKMETRICS-182: Use try-with-resources around the streams.

---
 .../openshift/auth/BasicAuthentication.java   | 21 ++++++++-----------
 .../auth/OpenShiftTokenAuthentication.java    | 11 +++++-----
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/containers/hawkular-metrics-openshift-integration/src/main/java/org/hawkular/openshift/auth/BasicAuthentication.java b/containers/hawkular-metrics-openshift-integration/src/main/java/org/hawkular/openshift/auth/BasicAuthentication.java
index caffffb58..fc706be16 100644
--- a/containers/hawkular-metrics-openshift-integration/src/main/java/org/hawkular/openshift/auth/BasicAuthentication.java
+++ b/containers/hawkular-metrics-openshift-integration/src/main/java/org/hawkular/openshift/auth/BasicAuthentication.java
@@ -54,20 +54,17 @@ public BasicAuthentication() throws IOException {
         File passwdFile = new File(HTPASSWD_FILE);
         if (passwdFile.exists() && passwdFile.isFile()) {
 
-            BufferedReader reader = new BufferedReader(new FileReader(passwdFile));
-
-            String line = reader.readLine();
-            while (line != null) {
-                String[] values = line.split(":", 2);
-                if (values.length == 2) {
-                    users.put(values[0], values[1]);
+            try (BufferedReader reader = new BufferedReader(new FileReader(passwdFile))) {
+                String line = reader.readLine();
+                while (line != null) {
+                    String[] values = line.split(":", 2);
+                    if (values.length == 2) {
+                        users.put(values[0], values[1]);
+                    }
+
+                    line = reader.readLine();
                 }
-
-                line = reader.readLine();
             }
-
-            reader.close();
-
         }
     }
 
diff --git a/containers/hawkular-metrics-openshift-integration/src/main/java/org/hawkular/openshift/auth/OpenShiftTokenAuthentication.java b/containers/hawkular-metrics-openshift-integration/src/main/java/org/hawkular/openshift/auth/OpenShiftTokenAuthentication.java
index e376bcea9..1fe629c77 100644
--- a/containers/hawkular-metrics-openshift-integration/src/main/java/org/hawkular/openshift/auth/OpenShiftTokenAuthentication.java
+++ b/containers/hawkular-metrics-openshift-integration/src/main/java/org/hawkular/openshift/auth/OpenShiftTokenAuthentication.java
@@ -94,12 +94,13 @@ private boolean isAuthorized(String method, String token, String projectId) {
             connection.setRequestProperty("Authorization", token);
 
             //Add the body
-            OutputStream outputStream = connection.getOutputStream();
-            for (byte b : generateSubjectAccessReview(projectId, verb).getBytes()) {
-                outputStream.write(b);
+            try (
+                OutputStream outputStream = connection.getOutputStream();
+            ) {
+                for (byte b : generateSubjectAccessReview(projectId, verb).getBytes()) {
+                    outputStream.write(b);
+                }
             }
-            outputStream.flush();
-            outputStream.close();
 
             //Perform the Operation
             connection.connect();