NullPointerException in HopsworksHttpClient

Author: SirOibaf

java/hsfs/src/main/java/com/logicalclocks/hsfs/metadata/HopsworksHttpClient.java

@@ -22,12 +22,14 @@
 import org.apache.http.HttpRequest;
 import org.apache.http.client.ResponseHandler;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.Charset;
 
 public interface HopsworksHttpClient {
-  static final Logger LOGGER = null;
+  Logger LOGGER = LoggerFactory.getLogger(HopsworksHttpClient.class);
 
   <T> T handleRequest(HttpRequest request, ResponseHandler<T> responseHandler)
       throws IOException, FeatureStoreException;
@@ -46,7 +48,7 @@ <T> T handleRequest(HttpRequest request, ResponseHandler<T> responseHandler)
 
   static String readCertKey(String materialPwd) {
     try {
-      return FileUtils.readFileToString(new File(materialPwd));
+      return FileUtils.readFileToString(new File(materialPwd), Charset.defaultCharset());
     } catch (IOException ex) {
       LOGGER.warn("Failed to get cert password.", ex);
     }

java/hsfs/src/test/java/com/logicalclocks/hsfs/metadata/TestHopsworksClient.java

@@ -46,4 +46,12 @@ public void testStringEntitySerialization() throws IOException {
     Assertions.assertEquals("{\"email\":\"test@test.com\",\"firstName\":\"test\",\"lastName\":\"de la Rúa Martínez\"}",
         json);
   }
+
+  // FSTORE-1562: readCertKey throws NullPointerException if
+  @Test
+  public void testReadCertKey_failure() {
+    String key = HopsworksHttpClient.readCertKey("/this/path/does/not/exists");
+    Assertions.assertNull(key);
+  }
+
 }