From 64113d812b3bc103f7387764e11b5133bbbc16ed Mon Sep 17 00:00:00 2001
From: Gert-Jan van der Heiden <gjvdspam@gmail.com>
Date: Thu, 18 Nov 2021 11:09:53 +0100
Subject: [PATCH] close JsonWriters

---
 CHANGES.md                                        |  1 +
 .../server/impl/json/AccessoryController.java     | 11 ++++-------
 .../impl/json/CharacteristicsController.java      |  8 ++++----
 .../hapjava/server/impl/json/EventController.java | 15 +++++++--------
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index bed3e3b48..c02a9f2a5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -33,6 +33,7 @@
 * Fix a pairing issue in which HAP-Java could listen on a different interface than that which it advertises [#67](https://github.com/hap-java/HAP-Java/pull/67)
 * Allow window covering to be used without optional characteristics. The inclusion of `HoldPositionCharacteristic` did terrible things, and we're still not sure why. Addressed [#56](https://github.com/hap-java/HAP-Java/pull/56)
 * Air Purifier didn't support rotation speed characteristics. [#124](https://github.com/hap-java/HAP-Java/pull/124)
+* Close JsonWriters [#148](https://github.com/hap-java/HAP-Java/pull/148)
 
 ## New and improved
 
diff --git a/src/main/java/io/github/hapjava/server/impl/json/AccessoryController.java b/src/main/java/io/github/hapjava/server/impl/json/AccessoryController.java
index 98e6cd266..795ecf2d0 100644
--- a/src/main/java/io/github/hapjava/server/impl/json/AccessoryController.java
+++ b/src/main/java/io/github/hapjava/server/impl/json/AccessoryController.java
@@ -14,10 +14,7 @@
 import java.util.Map.Entry;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import javax.json.*;
 
 public class AccessoryController {
 
@@ -64,9 +61,9 @@ public HttpResponse listing() throws Exception {
               .add("services", serviceArrayBuilders.get(accessory.getId())));
     }
 
-    try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-      Json.createWriter(baos)
-          .write(Json.createObjectBuilder().add("accessories", accessories).build());
+    try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        JsonWriter jsonWriter = Json.createWriter(baos)) {
+      jsonWriter.write(Json.createObjectBuilder().add("accessories", accessories).build());
       return new HapJsonResponse(baos.toByteArray());
     }
   }
diff --git a/src/main/java/io/github/hapjava/server/impl/json/CharacteristicsController.java b/src/main/java/io/github/hapjava/server/impl/json/CharacteristicsController.java
index df5509dda..4d20a0c6b 100644
--- a/src/main/java/io/github/hapjava/server/impl/json/CharacteristicsController.java
+++ b/src/main/java/io/github/hapjava/server/impl/json/CharacteristicsController.java
@@ -58,10 +58,10 @@ public HttpResponse get(HttpRequest request) throws Exception {
             "Accessory " + aid + " has no characteristics or does not exist. Request: " + uri);
       }
     }
-    try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-      Json.createWriter(baos)
-          .write(
-              Json.createObjectBuilder().add("characteristics", characteristics.build()).build());
+    try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        JsonWriter jsonWriter = Json.createWriter(baos)) {
+      jsonWriter.write(
+          Json.createObjectBuilder().add("characteristics", characteristics.build()).build());
       return new HapJsonResponse(baos.toByteArray());
     }
   }
diff --git a/src/main/java/io/github/hapjava/server/impl/json/EventController.java b/src/main/java/io/github/hapjava/server/impl/json/EventController.java
index 80be265ae..ea951c86f 100644
--- a/src/main/java/io/github/hapjava/server/impl/json/EventController.java
+++ b/src/main/java/io/github/hapjava/server/impl/json/EventController.java
@@ -5,10 +5,7 @@
 import io.github.hapjava.server.impl.http.HttpResponse;
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import javax.json.*;
 
 public class EventController {
 
@@ -24,8 +21,9 @@ public HttpResponse getMessage(int accessoryId, int iid, EventableCharacteristic
 
     JsonObject data = Json.createObjectBuilder().add("characteristics", characteristics).build();
 
-    try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-      Json.createWriter(baos).write(data);
+    try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        JsonWriter jsonWriter = Json.createWriter(baos)) {
+      jsonWriter.write(data);
       byte[] dataBytes = baos.toByteArray();
 
       return new EventResponse(dataBytes);
@@ -45,8 +43,9 @@ public HttpResponse getMessage(ArrayList<PendingNotification> notifications) thr
 
     JsonObject data = Json.createObjectBuilder().add("characteristics", characteristics).build();
 
-    try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-      Json.createWriter(baos).write(data);
+    try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        JsonWriter jsonWriter = Json.createWriter(baos)) {
+      jsonWriter.write(data);
       byte[] dataBytes = baos.toByteArray();
 
       return new EventResponse(dataBytes);