FS Fix b/34961349: Using mime-type.properties file crashes with NPE

This change fixes a NullPointerException introduced in commit 06e4ade.

[Brett, 2017-02-06 21:12:42]

Handle NIO NoSuchFileException

[JohnL, 2017-02-06 21:54:44]

Can we add a unit test with a mime-type.properties file?

John L

https://codereview.appspot.com/318490043/diff/20001/src/com/google/enterprise...
File src/com/google/enterprise/adaptor/fs/FsAdaptor.java (right):

https://codereview.appspot.com/318490043/diff/20001/src/com/google/enterprise...
src/com/google/enterprise/adaptor/fs/FsAdaptor.java:1221: return defaults;
Awfully small optimization, and why here and not in the other catch block?

[Brett, 2017-02-07 01:26:20]

Add unit tests

[Brett, 2017-02-07 01:26:35]

https://codereview.appspot.com/318490043/diff/20001/src/com/google/enterprise...
File src/com/google/enterprise/adaptor/fs/FsAdaptor.java (right):

https://codereview.appspot.com/318490043/diff/20001/src/com/google/enterprise...
src/com/google/enterprise/adaptor/fs/FsAdaptor.java:1221: return defaults;
On 2017/02/06 21:54:44, JohnL wrote:
> Awfully small optimization, and why here and not in the other catch block?

The FileNotFound is the most common case.  Theoretically, we could read a
partial properties file before getting an IOException.  I don't know why that
error is logged at FINE instead of WARNING, tho.  It could be because
Files.newBufferedReader() was actually showing NoSuchFileException instead of
FileNotFoundException.

[JohnL, 2017-02-08 02:00:54]

LGTM, with some suggestions.

John L

https://codereview.appspot.com/318490043/diff/40001/test/com/google/enterpris...
File test/com/google/enterprise/adaptor/fs/FsAdaptorTest.java (right):

https://codereview.appspot.com/318490043/diff/40001/test/com/google/enterpris...
test/com/google/enterprise/adaptor/fs/FsAdaptorTest.java:130: Files.write(file,
content.getBytes("UTF-8"));
The Charset override is preferred, with a static import of UTF_8 from Guava or
Java 7.

https://codereview.appspot.com/318490043/diff/40001/test/com/google/enterpris...
test/com/google/enterprise/adaptor/fs/FsAdaptorTest.java:149: assertEquals(new
Properties(), mimeTypes);
Would new Hashtable() be slightly less obfuscated?

https://codereview.appspot.com/318490043/diff/40001/test/com/google/enterpris...
test/com/google/enterprise/adaptor/fs/FsAdaptorTest.java:156: public void
testLoadMimeTypesUniqueValue() throws Exception {
s/Value/Key/ maybe, and the same in the MultipleValues test, but not the one
after that?

[Brett, 2017-02-08 20:19:15]

Committed 08 February 2017:
https://github.com/googlegsa/filesystem/commit/462a4a20dc773166da2523cc5da041...

https://codereview.appspot.com/318490043/diff/40001/test/com/google/enterpris...
File test/com/google/enterprise/adaptor/fs/FsAdaptorTest.java (right):

https://codereview.appspot.com/318490043/diff/40001/test/com/google/enterpris...
test/com/google/enterprise/adaptor/fs/FsAdaptorTest.java:130: Files.write(file,
content.getBytes("UTF-8"));
On 2017/02/08 02:00:53, JohnL wrote:
> The Charset override is preferred, with a static import of UTF_8 from Guava or
> Java 7.

Done.

https://codereview.appspot.com/318490043/diff/40001/test/com/google/enterpris...
test/com/google/enterprise/adaptor/fs/FsAdaptorTest.java:156: public void
testLoadMimeTypesUniqueValue() throws Exception {
On 2017/02/08 02:00:54, JohnL wrote:
> s/Value/Key/ maybe, and the same in the MultipleValues test, but not the one
> after that?

Done.