diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
index 7c8552cb5..a4ea83035 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
@@ -2501,7 +2501,7 @@ public class SolrInformationServer implements InformationServer
                 response);
         
         InputStream ris = response.getContent();
-        if (null != response.getContentEncoding() && response.getContentEncoding().equals("gzip"))
+        if (response.getContentEncoding().equals("gzip"))
         {
             ris = new GZIPInputStream(ris);
         }
diff --git a/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClient.java b/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClient.java
index b3278a273..ebc44dbd0 100644
--- a/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClient.java
+++ b/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClient.java
@@ -118,7 +118,7 @@ public class SOLRAPIClient
     /**
      * This option enables ("Accept-Encoding": "gzip") header for compression
      * in GET_CONTENT requests. Additional configuration is required in 
-     * Alfresco Repository Tomcat Connector or HTTP Web Proxy to deal w
+     * Alfresco Repository Tomcat Connector or HTTP Web Proxy to deal
      * with compressed requests.
      */
     private boolean compression;
@@ -1137,7 +1137,7 @@ public class SOLRAPIClient
         
         GetRequest req = new GetRequest(url.toString());
         
-        Map<String, String> headers = new HashMap<String, String>();
+        Map<String, String> headers = new HashMap<>();
         if(modifiedSince != null)
         {
             headers.put("If-Modified-Since", String.valueOf(DateUtil.formatDate(new Date(modifiedSince))));