Remove commons-io and other code tidy-ups

Author: nightowlengineer

pom.xml

@@ -84,11 +84,6 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.11</version>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.8.0</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>

src/main/java/engineer/nightowl/sonos/api/SonosApiClient.java

@@ -14,12 +14,15 @@
 import engineer.nightowl.sonos.api.resource.PlayerVolumeResource;
 import engineer.nightowl.sonos.api.resource.PlaylistResource;
 import engineer.nightowl.sonos.api.resource.SettingsResource;
+
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.VersionInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.net.http.HttpClient;
 import java.util.Properties;
 
 public class SonosApiClient implements AutoCloseable
@@ -48,6 +51,8 @@ public class SonosApiClient implements AutoCloseable
     private SonosApiConfiguration configuration;
     private CloseableHttpClient httpClient;
 
+    private final String version;
+
     /**
      * Main client for Sonos API.
      *
@@ -71,10 +76,12 @@ public SonosApiClient(final SonosApiConfiguration configuration)
     public SonosApiClient(final SonosApiConfiguration configuration, final CloseableHttpClient httpClient)
     {
         loadProperties();
-        logger.info("Initialising sonos-api-java:{}", properties.getProperty("sonosapijava.version"));
+        version = properties.getProperty("sonosapijava.version");
+        logger.info("Initialising sonos-api-java:{}", version);
 
         this.configuration = configuration;
         this.httpClient = (httpClient == null ? generateHttpClient() : httpClient);
+        
 
         // Setup resources
         audioClipResource = new AudioClipResource(this);
@@ -93,6 +100,15 @@ public SonosApiClient(final SonosApiConfiguration configuration, final Closeable
         settingsResource = new SettingsResource(this);
     }
 
+    public String getUserAgent()
+    {
+        final String ahcUa = VersionInfo.getUserAgent("Apache-HttpClient",
+                "org.apache.http.client", HttpClientBuilder.class);
+
+        return String.format("sonos-api-java/%s (applicationId/%s) (httpClient/(%s))",
+                version, configuration.getApplicationId(), ahcUa);
+    }
+
     /**
      * Generate a default HTTP client.
      *
@@ -101,7 +117,7 @@ public SonosApiClient(final SonosApiConfiguration configuration, final Closeable
     private CloseableHttpClient generateHttpClient()
     {
         logger.debug("Using default HttpClient");
-        return HttpClientBuilder.create().build();
+        return HttpClientBuilder.create().setUserAgent(getUserAgent()).build();
     }
 
     /**

src/main/java/engineer/nightowl/sonos/api/resource/BaseResource.java

@@ -11,7 +11,6 @@
 import engineer.nightowl.sonos.api.exception.SonosApiError;
 import engineer.nightowl.sonos.api.specs.Validatable;
 import engineer.nightowl.sonos.api.util.SonosUtilityHelper;
-import org.apache.commons.io.IOUtils;
 import org.apache.http.Header;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpDelete;
@@ -83,7 +82,7 @@ <T> T callApi(final HttpUriRequest request, final Class<T> type) throws SonosApi
         final byte[] bytes;
         try (final InputStream stream = response.getEntity().getContent())
         {
-            bytes = IOUtils.toByteArray(stream);
+            bytes = stream.readAllBytes();
         } catch (final IOException ioe)
         {
             throw new SonosApiClientException("Unable to convert response body", ioe);

src/main/java/engineer/nightowl/sonos/api/util/SonosCallbackHelper.java

@@ -50,7 +50,7 @@ public static Boolean verifySignature(final Map<String, String> headers, final S
 
         final String signature = Base64.getUrlEncoder().withoutPadding().encodeToString(messageDigest.digest());
 
-        logger.debug("Verifying signature: " + signature);
+        logger.debug("Verifying signature: {}", signature);
 
         return signature.equals(headers.get("X-Sonos-Event-Signature"));
     }