motiejus
/
jgit
1
Fork 0
Code Releases Activity

Fix NarrowingCompoundAssignment warnings from Error Prone 

Error Prone reports:

  [NarrowingCompoundAssignment] Compound assignments from long to int
  hide lossy casts

and

  [NarrowingCompoundAssignment] Compound assignments from int to byte
  hide lossy casts

  See https://errorprone.info/bugpattern/NarrowingCompoundAssignment

Fix the warnings by adding explicit casts or changing types as
necessary.

Now that all occurrences of the warning are fixed, increase its
severity to ERROR.

Change-Id: Idb3670e6047b146ae37daee07212ff9455512623
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2019-06-22 18:47:43 +09:00 committed by Matthias Sohn
parent aefb11298c
commit 72ae089206
10 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java
View File

@ -842,9 +842,9 @@ public ObjectReader newReader() {
* Throws an exception if reading beyond limit.
*/
static class BigReadForbiddenStream extends ObjectStream.Filter {
int limit;
long limit;
BigReadForbiddenStream(ObjectStream orig, int limit) {
BigReadForbiddenStream(ObjectStream orig, long limit) {
super(orig.getType(), orig.getSize(), orig);
this.limit = limit;
}

8
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java
View File

@ -448,9 +448,9 @@ public boolean isAssumeValid() {
*/
public void setAssumeValid(boolean assume) {
if (assume)
info[infoOffset + P_FLAGS] |= ASSUME_VALID;
info[infoOffset + P_FLAGS] |= (byte) ASSUME_VALID;
else
info[infoOffset + P_FLAGS] &= ~ASSUME_VALID;
info[infoOffset + P_FLAGS] &= (byte) ~ASSUME_VALID;
}
/**
@ -470,9 +470,9 @@ public boolean isUpdateNeeded() {
*/
public void setUpdateNeeded(boolean updateNeeded) {
if (updateNeeded)
inCoreFlags |= UPDATE_NEEDED;
inCoreFlags |= (byte) UPDATE_NEEDED;
else
inCoreFlags &= ~UPDATE_NEEDED;
inCoreFlags &= (byte) ~UPDATE_NEEDED;
}
/**

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java
View File

@ -661,7 +661,7 @@ private static boolean isTag(Ref ref) {
private int objectsBefore() {
int cnt = 0;
for (DfsPackFile p : packsBefore)
cnt += p.getPackDescription().getObjectCount();
cnt += (int) p.getPackDescription().getObjectCount();
return cnt;
}

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackParser.java
View File

@ -432,7 +432,7 @@ protected boolean onAppendBase(final int typeCode, final byte[] data,
buf[len++] = (byte) ((typeCode << 4) | (sz & 15));
sz >>>= 4;
while (sz > 0) {
buf[len - 1] |= 0x80;
buf[len - 1] |= (byte) 0x80;
buf[len++] = (byte) (sz & 0x7f);
sz >>>= 7;
}

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectoryPackParser.java
View File

@ -356,7 +356,7 @@ protected boolean onAppendBase(final int typeCode, final byte[] data,
buf[len++] = (byte) ((typeCode << 4) | (sz & 15));
sz >>>= 4;
while (sz > 0) {
buf[len - 1] |= 0x80;
buf[len - 1] |= (byte) 0x80;
buf[len++] = (byte) (sz & 0x7f);
sz >>>= 7;
}

4
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/BinaryDelta.java
View File

@ -142,7 +142,7 @@ public static final byte[] apply(final byte[] base, final byte[] delta,
int c, shift = 0;
do {
c = delta[deltaPtr++] & 0xff;
baseLen |= ((long) (c & 0x7f)) << shift;
baseLen |= (c & 0x7f) << shift;
shift += 7;
} while ((c & 0x80) != 0);
if (base.length != baseLen)
@ -155,7 +155,7 @@ public static final byte[] apply(final byte[] base, final byte[] delta,
shift = 0;
do {
c = delta[deltaPtr++] & 0xff;
resLen |= ((long) (c & 0x7f)) << shift;
resLen |= (c & 0x7f) << shift;
shift += 7;
} while ((c & 0x80) != 0);

7
org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java
View File

@ -642,11 +642,12 @@ private boolean isEntryGitLink(AbstractTreeIterator ti) {
private void addConflict(String path, int stage) {
StageState existingStageStates = conflicts.get(path);
byte stageMask = 0;
if (existingStageStates != null)
stageMask |= existingStageStates.getStageMask();
if (existingStageStates != null) {
stageMask |= (byte) existingStageStates.getStageMask();
}
// stage 1 (base) should be shifted 0 times
int shifts = stage - 1;
stageMask |= (1 << shifts);
stageMask |= (byte) (1 << shifts);
StageState stageState = StageState.fromMask(stageMask);
conflicts.put(path, stageState);
}

2
org.eclipse.jgit/src/org/eclipse/jgit/revwalk/FooterLine.java
View File

@ -95,7 +95,7 @@ public boolean matches(FooterKey key) {
for (int kPtr = 0; kPtr < len;) {
byte b = buffer[bPtr++];
if ('A' <= b && b <= 'Z')
b += 'a' - 'A';
b += (byte) ('a' - 'A');
if (b != kRaw[kPtr++])
return false;
}

2
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/TreeFilterMarker.java
View File

@ -113,7 +113,7 @@ public int getMarks(TreeWalk walk) throws MissingObjectException,
try {
boolean marked = filter.include(walk);
if (marked)
marks |= (1L << index);
marks |= (1 << index);
} catch (StopWalkException e) {
// Don't check tree filter anymore, it will no longer
// match

2
tools/BUILD
View File

@ -58,7 +58,7 @@ java_package_configuration(
"-Xep:MissingFail:ERROR",
"-Xep:MissingOverride:ERROR",
"-Xep:MutableConstantField:ERROR",
"-Xep:NarrowingCompoundAssignment:WARN",
"-Xep:NarrowingCompoundAssignment:ERROR",
"-Xep:NonAtomicVolatileUpdate:ERROR",
"-Xep:NonOverridingEquals:ERROR",
"-Xep:NullableConstructor:ERROR",