--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileStore.java	Fri May 17 03:01:21 2019 -0400
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileStore.java	Fri May 17 09:00:39 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,14 +68,14 @@
 
     @Override
     public boolean supportsFileAttributeView(String name) {
-        return name.equals("basic") || name.equals("zip");
+        return "basic".equals(name) || "zip".equals(name);
     }
 
     @Override
     public <V extends FileStoreAttributeView> V getFileStoreAttributeView(Class<V> type) {
         if (type == null)
             throw new NullPointerException();
-        return (V)null;
+        return null;
     }
 
     @Override
@@ -108,7 +108,7 @@
         final FileStore fstore;
         final long size;
 
-        public ZipFileStoreAttributes(ZipFileStore fileStore)
+        ZipFileStoreAttributes(ZipFileStore fileStore)
             throws IOException
         {
             Path path = FileSystems.getDefault().getPath(fileStore.name());
@@ -116,17 +116,17 @@
             this.fstore = Files.getFileStore(path);
         }
 
-        public long totalSpace() {
+        long totalSpace() {
             return size;
         }
 
-        public long usableSpace() throws IOException {
+        long usableSpace() throws IOException {
             if (!fstore.isReadOnly())
                 return fstore.getUsableSpace();
             return 0;
         }
 
-        public long unallocatedSpace()  throws IOException {
+        long unallocatedSpace()  throws IOException {
             if (!fstore.isReadOnly())
                 return fstore.getUnallocatedSpace();
             return 0;