Fix all remaining instances of the OperatorPrededence warning, by adding parentheses to make the precedence explicit. Change-Id: Ib296dfed09f9be042d0ff0f7fad8214e4dd766b4 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>tags/v5.4.0.201906121030-r
@@ -64,7 +64,7 @@ public final class WildMatcher extends AbstractMatcher { | |||
public final boolean matches(String path, boolean assumeDirectory, | |||
boolean pathMatch) { | |||
return !dirOnly || assumeDirectory | |||
|| !pathMatch && isSubdirectory(path); | |||
|| (!pathMatch && isSubdirectory(path)); | |||
} | |||
/** {@inheritDoc} */ |
@@ -429,7 +429,7 @@ public class DfsPackParser extends PackParser { | |||
final byte[] buf = buffer(); | |||
int sz = data.length; | |||
int len = 0; | |||
buf[len++] = (byte) ((typeCode << 4) | sz & 15); | |||
buf[len++] = (byte) ((typeCode << 4) | (sz & 15)); | |||
sz >>>= 4; | |||
while (sz > 0) { | |||
buf[len - 1] |= 0x80; |
@@ -353,7 +353,7 @@ public class ObjectDirectoryPackParser extends PackParser { | |||
final byte[] buf = buffer(); | |||
int sz = data.length; | |||
int len = 0; | |||
buf[len++] = (byte) ((typeCode << 4) | sz & 15); | |||
buf[len++] = (byte) ((typeCode << 4) | (sz & 15)); | |||
sz >>>= 4; | |||
while (sz > 0) { | |||
buf[len - 1] |= 0x80; |
@@ -295,7 +295,7 @@ public class UnpackedObject { | |||
* can always correctly determine the buffer format. | |||
*/ | |||
final int fb = hdr[0] & 0xff; | |||
return (fb & 0x8f) == 0x08 && (((fb << 8) | hdr[1] & 0xff) % 31) == 0; | |||
return (fb & 0x8f) == 0x08 && (((fb << 8) | (hdr[1] & 0xff)) % 31) == 0; | |||
} | |||
static InputStream inflate(final InputStream in, final long size, |
@@ -677,7 +677,7 @@ public abstract class BasePackFetchConnection extends BasePackConnection | |||
state.writeTo(out, null); | |||
} | |||
if (receivedContinue && havesSinceLastContinue > MAX_HAVES | |||
if ((receivedContinue && havesSinceLastContinue > MAX_HAVES) | |||
|| havesSent >= maxHaves) { | |||
// Our history must be really different from the remote's. | |||
// We just sent a whole slew of have lines, and it did not |
@@ -397,8 +397,9 @@ public class HttpConfig { | |||
// A longer path match is always preferred even over a user | |||
// match. If the path matches are equal, a match with user wins | |||
// over a match without user. | |||
if (matchLength > bestMatchLength || !withUser && hasUser | |||
&& matchLength >= 0 && matchLength == bestMatchLength) { | |||
if (matchLength > bestMatchLength | |||
|| (!withUser && hasUser && matchLength >= 0 | |||
&& matchLength == bestMatchLength)) { | |||
bestMatch = s; | |||
bestMatchLength = matchLength; | |||
withUser = hasUser; | |||
@@ -444,7 +445,7 @@ public class HttpConfig { | |||
int uLength = uriPath.length(); | |||
int mLength = matchPath.length(); | |||
if (mLength == uLength || matchPath.charAt(mLength - 1) == '/' | |||
|| mLength < uLength && uriPath.charAt(mLength) == '/') { | |||
|| (mLength < uLength && uriPath.charAt(mLength) == '/')) { | |||
return mLength; | |||
} | |||
return -1; | |||
@@ -464,7 +465,7 @@ public class HttpConfig { | |||
if (slash < 0) { | |||
slash = length; | |||
} | |||
if (slash == i || slash == i + 1 && path.charAt(i) == '.') { | |||
if (slash == i || (slash == i + 1 && path.charAt(i) == '.')) { | |||
// Skip /. or also double slashes | |||
} else if (slash == i + 2 && path.charAt(i) == '.' | |||
&& path.charAt(i + 1) == '.') { |
@@ -362,8 +362,8 @@ public class URIish implements Serializable { | |||
if (p.length() >= 3 | |||
&& p.charAt(0) == '/' | |||
&& p.charAt(2) == ':' | |||
&& (p.charAt(1) >= 'A' && p.charAt(1) <= 'Z' || p.charAt(1) >= 'a' | |||
&& p.charAt(1) <= 'z')) | |||
&& ((p.charAt(1) >= 'A' && p.charAt(1) <= 'Z') | |||
|| (p.charAt(1) >= 'a' && p.charAt(1) <= 'z'))) | |||
return p.substring(1); | |||
else if (s != null && p.length() >= 2 && p.charAt(0) == '/' | |||
&& p.charAt(1) == '~') |
@@ -64,7 +64,7 @@ java_package_configuration( | |||
"-Xep:NullableConstructor:ERROR", | |||
"-Xep:NullablePrimitive:ERROR", | |||
"-Xep:NullableVoid:ERROR", | |||
"-Xep:OperatorPrecedence:WARN", | |||
"-Xep:OperatorPrecedence:ERROR", | |||
"-Xep:OverridesGuiceInjectableMethod:ERROR", | |||
"-Xep:PreconditionsInvalidPlaceholder:ERROR", | |||
"-Xep:ProtoFieldPreconditionsCheckNotNull:ERROR", |