PMD: merge nested ifs

KostyaSha · KostyaSha · commit 92ac07d74ed1 · 2015-10-10T17:20:31.000+03:00
diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
@@ -25,10 +25,8 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi
                 TarArchiveEntry tarEntry = new TarArchiveEntry(file);
                 tarEntry.setName(relativize(base, file));
 
-                if (!file.isDirectory()) {
-                    if (file.canExecute()) {
-                        tarEntry.setMode(tarEntry.getMode() | 0755);
-                    }
+                if (!file.isDirectory() && file.canExecute()) {
+                    tarEntry.setMode(tarEntry.getMode() | 0755);
                 }
 
                 tos.putArchiveEntry(tarEntry);
diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -113,11 +113,8 @@ static ScanResult scanChunk(String pattern) {
         Scan: for (i = 0; i < pattern.length(); i++) {
             switch (pattern.charAt(i)) {
             case '\\': {
-                if (!IS_WINDOWS) {
-                    // error check handled in matchChunk: bad pattern.
-                    if (i + 1 < pattern.length()) {
-                        i++;
-                    }
+                if (!IS_WINDOWS && i + 1 < pattern.length()) {
+                    i++;
                 }
                 break;
             }
diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -80,10 +80,8 @@ public static RemoteApiVersion parseConfigWithDefault(final String version) {
     }
 
     public boolean isGreaterOrEqual(final RemoteApiVersion other) {
-        if (major >= other.major) {
-            if (minor >= other.minor) {
-                return true;
-            }
+        if (major >= other.major && minor >= other.minor) {
+            return true;
         }
         return false;
     }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
@@ -213,12 +213,10 @@ class ApacheConnector implements Connector {
         if (config != null) {
             final Object connectionManager = config.getProperties().get(ApacheClientProperties.CONNECTION_MANAGER);
 
-            if (connectionManager != null) {
-                if (!(connectionManager instanceof HttpClientConnectionManager)) {
-                    LOGGER.log(Level.WARNING, LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
-                            ApacheClientProperties.CONNECTION_MANAGER, connectionManager.getClass().getName(),
-                            HttpClientConnectionManager.class.getName()));
-                }
+            if (connectionManager != null && !(connectionManager instanceof HttpClientConnectionManager)) {
+                LOGGER.log(Level.WARNING, LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
+                        ApacheClientProperties.CONNECTION_MANAGER, connectionManager.getClass().getName(),
+                        HttpClientConnectionManager.class.getName()));
             }
 
             reqConfig = config.getProperties().get(ApacheClientProperties.REQUEST_CONFIG);

Original file line number	Diff line number	Diff line change
`@@ -113,11 +113,8 @@ static ScanResult scanChunk(String pattern) {`
`113`	`113`	`Scan: for (i = 0; i < pattern.length(); i++) {`
`114`	`114`	`switch (pattern.charAt(i)) {`
`115`	`115`	`case '\\': {`
`116`		`- if (!IS_WINDOWS) {`
`117`		`- // error check handled in matchChunk: bad pattern.`
`118`		`- if (i + 1 < pattern.length()) {`
`119`		`- i++;`
`120`		`- }`
	`116`	`+ if (!IS_WINDOWS && i + 1 < pattern.length()) {`
	`117`	`+ i++;`
`121`	`118`	`}`
`122`	`119`	`break;`
`123`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,10 +80,8 @@ public static RemoteApiVersion parseConfigWithDefault(final String version) {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`public boolean isGreaterOrEqual(final RemoteApiVersion other) {`
`83`		`- if (major >= other.major) {`
`84`		`- if (minor >= other.minor) {`
`85`		`- return true;`
`86`		`- }`
	`83`	`+ if (major >= other.major && minor >= other.minor) {`
	`84`	`+ return true;`
`87`	`85`	`}`
`88`	`86`	`return false;`
`89`	`87`	`}`