Raise embedded if into parent.

Author: Gary Gregory

src/main/java/org/apache/commons/io/FileUtils.java

@@ -2195,10 +2195,8 @@ public static Collection<File> listFilesAndDirs(
      * @see File#mkdirs()
      */
     private static File mkdirs(final File directory) throws IOException {
-        if (directory != null) {
-            if (!directory.mkdirs() && !directory.isDirectory()) {
-                throw new IOException("Cannot create directory '" + directory + "'.");
-            }
+        if ((directory != null) && (!directory.mkdirs() && !directory.isDirectory())) {
+            throw new IOException("Cannot create directory '" + directory + "'.");
         }
         return directory;
     }

src/main/java/org/apache/commons/io/input/BOMInputStream.java

@@ -218,13 +218,11 @@ public ByteOrderMark getBOM() throws IOException {
             }
             // match BOM in firstBytes
             byteOrderMark = find();
-            if (byteOrderMark != null) {
-                if (!include) {
-                    if (byteOrderMark.length() < firstBytes.length) {
-                        fbIndex = byteOrderMark.length();
-                    } else {
-                        fbLength = 0;
-                    }
+            if ((byteOrderMark != null) && !include) {
+                if (byteOrderMark.length() < firstBytes.length) {
+                    fbIndex = byteOrderMark.length();
+                } else {
+                    fbLength = 0;
                 }
             }
         }

src/main/java/org/apache/commons/io/input/WindowsLineEndingInputStream.java

@@ -85,11 +85,9 @@ public int read() throws IOException {
             if (eofSeen) {
                 return eofGame();
             }
-            if (target == LF) {
-                if (!prevWasSlashR) {
-                    injectSlashN = true;
-                    return CR;
-                }
+            if ((target == LF) && !prevWasSlashR) {
+                injectSlashN = true;
+                return CR;
             }
             return target;
         }

src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReader.java

@@ -368,17 +368,15 @@ public XmlStreamReader(final InputStream inputStream, final String httpContentTy
 
     private void doLenientDetection(String httpContentType,
             XmlStreamReaderException ex) throws IOException {
-        if (httpContentType != null) {
-            if (httpContentType.startsWith("text/html")) {
-                httpContentType = httpContentType.substring("text/html"
-                        .length());
-                httpContentType = "text/xml" + httpContentType;
-                try {
-                    doHttpStream(ex.getInputStream(), httpContentType, true);
-                    ex = null;
-                } catch (final XmlStreamReaderException ex2) {
-                    ex = ex2;
-                }
+        if ((httpContentType != null) && httpContentType.startsWith("text/html")) {
+            httpContentType = httpContentType.substring("text/html"
+                    .length());
+            httpContentType = "text/xml" + httpContentType;
+            try {
+                doHttpStream(ex.getInputStream(), httpContentType, true);
+                ex = null;
+            } catch (final XmlStreamReaderException ex2) {
+                ex = ex2;
             }
         }
         if (ex != null) {