Merge "JERSEY-2621 JarFileScanner ignores recursive flag on Windows"

Author: Michal Gajdoš

core-server/src/main/java/org/glassfish/jersey/server/internal/scanning/JarFileScanner.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -39,7 +39,6 @@
  */
 package org.glassfish.jersey.server.internal.scanning;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.NoSuchElementException;
@@ -57,7 +56,9 @@
  */
 public final class JarFileScanner implements ResourceFinder {
 
-    private final static Logger LOGGER = Logger.getLogger(JarFileScanner.class.getName());
+    private static final Logger LOGGER = Logger.getLogger(JarFileScanner.class.getName());
+    // platform independent file separator within the jar file
+    private static final char JAR_FILE_SEPARATOR = '\\';
 
     private final JarInputStream jarInputStream;
     private final String parent;
@@ -72,7 +73,7 @@ public final class JarFileScanner implements ResourceFinder {
      * {@code false} only the explicitly listed packages will be scanned.
      * @throws IOException if wrapping given input stream into {@link JarInputStream} failed.
      */
-    public JarFileScanner(InputStream inputStream, String parent, boolean recursive) throws IOException {
+    public JarFileScanner(final InputStream inputStream, final String parent, final boolean recursive) throws IOException {
         this.jarInputStream = new JarInputStream(inputStream);
         this.parent = parent;
         this.recursive = recursive;
@@ -95,16 +96,16 @@ public boolean hasNext() {
                             break;
                         }
                         // accept only entries directly in the folder.
-                        String suffix = next.getName().substring(parent.length());
-                        if (suffix.lastIndexOf(File.separatorChar) <= 0) {
+                        final String suffix = next.getName().substring(parent.length());
+                        if (suffix.lastIndexOf(JAR_FILE_SEPARATOR) <= 0) {
                             break;
                         }
                     }
                 } while (true);
-            } catch (IOException e) {
+            } catch (final IOException e) {
                 LOGGER.log(Level.CONFIG, "Unable to read the next jar entry.", e);
                 return false;
-            } catch (SecurityException e) {
+            } catch (final SecurityException e) {
                 LOGGER.log(Level.CONFIG, "Unable to read the next jar entry.", e);
                 return false;
             }
@@ -113,7 +114,7 @@ public boolean hasNext() {
         if (next == null) {
             try {
                 jarInputStream.close();
-            } catch (IOException e) {
+            } catch (final IOException e) {
                 LOGGER.log(Level.FINE, "Unable to close jar file.", e);
             }
 
@@ -154,17 +155,17 @@ public int read() throws IOException {
             }
 
             @Override
-            public int read(byte[] bytes) throws IOException {
+            public int read(final byte[] bytes) throws IOException {
                 return jarInputStream.read(bytes);
             }
 
             @Override
-            public int read(byte[] bytes, int i, int i2) throws IOException {
+            public int read(final byte[] bytes, final int i, final int i2) throws IOException {
                 return jarInputStream.read(bytes, i, i2);
             }
 
             @Override
-            public long skip(long l) throws IOException {
+            public long skip(final long l) throws IOException {
                 return jarInputStream.skip(l);
             }
 
@@ -179,7 +180,7 @@ public void close() throws IOException {
             }
 
             @Override
-            public synchronized void mark(int i) {
+            public synchronized void mark(final int i) {
                 jarInputStream.mark(i);
             }